Skip to content

Commit 807f770

Browse files
robotgryphonrobotgryphon
committed
Add CompactDim api constants for ease of use, switch usages
1 parent 192d86f commit 807f770

25 files changed

+102
-81
lines changed

‎src/api/java/dev/compactmods/machines/api/dimension/CompactDimension.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package dev.compactmods.machines.api.dimension;
2+
3+
import net.minecraft.core.Registry;
4+
import net.minecraft.resources.ResourceKey;
5+
import net.minecraft.resources.ResourceLocation;
6+
import net.minecraft.world.level.Level;
7+
import net.minecraft.world.level.dimension.DimensionType;
8+
9+
import static dev.compactmods.machines.api.core.Constants.MOD_ID;
10+
11+
public abstract class CompactDimension {
12+
public static final ResourceKey<Level> LEVEL_KEY = ResourceKey
13+
.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(MOD_ID, "compact_world"));
14+
15+
public static final ResourceKey<DimensionType> DIM_TYPE_KEY = ResourceKey
16+
.create(Registry.DIMENSION_TYPE_REGISTRY, new ResourceLocation(MOD_ID, "compact_world"));
17+
18+
private CompactDimension() {}
19+
}

‎src/main/java/dev/compactmods/machines/command/data/CMRoomDataExportCommand.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import dev.compactmods.machines.CompactMachines;
66
import dev.compactmods.machines.api.core.CMCommands;
77
import dev.compactmods.machines.api.core.Constants;
8+
import dev.compactmods.machines.api.dimension.CompactDimension;
89
import dev.compactmods.machines.i18n.TranslationUtil;
910
import dev.compactmods.machines.room.data.CompactRoomData;
1011
import net.minecraft.commands.CommandSourceStack;
@@ -29,7 +30,7 @@ public class CMRoomDataExportCommand {
2930
private static int execAll(CommandContext<CommandSourceStack> ctx) {
3031
var src = ctx.getSource();
3132
var serv = src.getServer();
32-
var compact = serv.getLevel(Dimension.COMPACT_DIMENSION);
33+
var compact = serv.getLevel(CompactDimension.LEVEL_KEY);
3334

3435
final CompactRoomData rooms = CompactRoomData.get(compact);
3536

‎src/main/java/dev/compactmods/machines/command/data/CMTunnelDataExportCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import dev.compactmods.machines.CompactMachines;
77
import dev.compactmods.machines.api.core.CMCommands;
88
import dev.compactmods.machines.api.core.Constants;
9+
import dev.compactmods.machines.api.dimension.CompactDimension;
910
import dev.compactmods.machines.command.argument.RoomPositionArgument;
1011
import dev.compactmods.machines.dimension.MissingDimensionException;
11-
import dev.compactmods.machines.dimension.Dimension;
1212
import dev.compactmods.machines.i18n.TranslationUtil;
1313
import dev.compactmods.machines.room.data.CompactRoomData;
1414
import dev.compactmods.machines.tunnel.graph.TunnelConnectionGraph;
@@ -40,7 +40,7 @@ public class CMTunnelDataExportCommand {
4040
private static int execAll(CommandContext<CommandSourceStack> ctx) {
4141
var src = ctx.getSource();
4242
var serv = src.getServer();
43-
var compact = serv.getLevel(Dimension.COMPACT_DIMENSION);
43+
var compact = serv.getLevel(CompactDimension.LEVEL_KEY);
4444

4545
final CompactRoomData rooms = CompactRoomData.get(compact);
4646

@@ -78,7 +78,7 @@ public static int exec(CommandContext<CommandSourceStack> ctx) throws CommandSyn
7878
ServerPlayer player = src.getPlayerOrException();
7979

8080
final var room = RoomPositionArgument.get(ctx, "room");
81-
final var compactDim = src.getServer().getLevel(Dimension.COMPACT_DIMENSION);
81+
final var compactDim = src.getServer().getLevel(CompactDimension.LEVEL_KEY);
8282

8383
var outdir = src.getServer().getFile(Constants.MOD_ID);
8484
var out = outdir.toPath()

‎src/main/java/dev/compactmods/machines/command/subcommand/CMReaddDimensionSubcommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.mojang.brigadier.context.CommandContext;
55
import com.mojang.brigadier.exceptions.CommandSyntaxException;
66
import dev.compactmods.machines.api.core.CMCommands;
7-
import dev.compactmods.machines.dimension.Dimension;
7+
import dev.compactmods.machines.api.dimension.CompactDimension;
88
import dev.compactmods.machines.i18n.TranslationUtil;
99
import dev.compactmods.machines.util.DimensionUtil;
1010
import net.minecraft.ChatFormatting;
@@ -22,7 +22,7 @@ private static int exec(CommandContext<CommandSourceStack> ctx) throws CommandSy
2222
var src = ctx.getSource();
2323
var serv = src.getServer();
2424

25-
var compactLevel = serv.getLevel(Dimension.COMPACT_DIMENSION);
25+
var compactLevel = serv.getLevel(CompactDimension.LEVEL_KEY);
2626
if (compactLevel == null) {
2727
src.sendSuccess(TranslationUtil.command(CMCommands.LEVEL_NOT_FOUND).withStyle(ChatFormatting.RED), false);
2828

‎src/main/java/dev/compactmods/machines/command/subcommand/CMRebindSubcommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import com.mojang.brigadier.exceptions.CommandSyntaxException;
66
import dev.compactmods.machines.CompactMachines;
77
import dev.compactmods.machines.api.core.CMCommands;
8+
import dev.compactmods.machines.api.dimension.CompactDimension;
89
import dev.compactmods.machines.command.argument.RoomPositionArgument;
910
import dev.compactmods.machines.config.ServerConfig;
10-
import dev.compactmods.machines.dimension.Dimension;
1111
import dev.compactmods.machines.i18n.TranslationUtil;
1212
import dev.compactmods.machines.machine.CompactMachineBlockEntity;
1313
import dev.compactmods.machines.tunnel.graph.TunnelConnectionGraph;
@@ -32,7 +32,7 @@ public static LiteralArgumentBuilder<CommandSourceStack> make() {
3232
private static int doRebind(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
3333
final var server = ctx.getSource().getServer();
3434
final var level = ctx.getSource().getLevel();
35-
final var compactDim = server.getLevel(Dimension.COMPACT_DIMENSION);
35+
final var compactDim = server.getLevel(CompactDimension.LEVEL_KEY);
3636
if(compactDim == null) {
3737
throw new CommandRuntimeException(TranslationUtil.command(CMCommands.LEVEL_NOT_FOUND));
3838
}

‎src/main/java/dev/compactmods/machines/command/subcommand/CMRoomsSubcommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import dev.compactmods.machines.CompactMachines;
77
import dev.compactmods.machines.api.core.CMCommands;
88
import dev.compactmods.machines.api.core.Messages;
9-
import dev.compactmods.machines.dimension.Dimension;
9+
import dev.compactmods.machines.api.dimension.CompactDimension;
1010
import dev.compactmods.machines.i18n.TranslationUtil;
1111
import dev.compactmods.machines.machine.CompactMachineBlock;
1212
import dev.compactmods.machines.machine.CompactMachineBlockEntity;
@@ -69,7 +69,7 @@ private static int findByContainingPlayer(CommandContext<CommandSourceStack> ctx
6969
final var playerChunk = player.chunkPosition();
7070
final var playerLevel = player.getLevel();
7171

72-
if (!playerLevel.dimension().equals(Dimension.COMPACT_DIMENSION)) {
72+
if (!playerLevel.dimension().equals(CompactDimension.LEVEL_KEY)) {
7373
throw new CommandRuntimeException(TranslationUtil.command(CMCommands.WRONG_DIMENSION));
7474
}
7575

@@ -91,7 +91,7 @@ private static int findByContainingPlayer(CommandContext<CommandSourceStack> ctx
9191
public static int findByOwner(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
9292
final var owner = EntityArgument.getPlayer(ctx, "owner");
9393
final var server = ctx.getSource().getServer();
94-
final var compactDim = server.getLevel(Dimension.COMPACT_DIMENSION);
94+
final var compactDim = server.getLevel(CompactDimension.LEVEL_KEY);
9595

9696
final var rooms = CompactRoomData.get(compactDim);
9797
rooms.streamRooms()

‎src/main/java/dev/compactmods/machines/command/subcommand/CMSummarySubcommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import com.mojang.brigadier.builder.ArgumentBuilder;
44
import com.mojang.brigadier.context.CommandContext;
55
import dev.compactmods.machines.api.core.CMCommands;
6-
import dev.compactmods.machines.dimension.Dimension;
6+
import dev.compactmods.machines.api.dimension.CompactDimension;
7+
import dev.compactmods.machines.i18n.TranslationUtil;
78
import dev.compactmods.machines.machine.graph.DimensionMachineGraph;
89
import dev.compactmods.machines.room.data.CompactRoomData;
9-
import dev.compactmods.machines.i18n.TranslationUtil;
1010
import net.minecraft.ChatFormatting;
1111
import net.minecraft.commands.CommandSourceStack;
1212
import net.minecraft.commands.Commands;
@@ -25,7 +25,7 @@ private static int exec(CommandContext<CommandSourceStack> ctx) {
2525
var src = ctx.getSource();
2626
var serv = src.getServer();
2727

28-
var compactLevel = serv.getLevel(Dimension.COMPACT_DIMENSION);
28+
var compactLevel = serv.getLevel(CompactDimension.LEVEL_KEY);
2929
if (compactLevel != null) {
3030
src.sendSuccess(TranslationUtil.command(CMCommands.LEVEL_REGISTERED).withStyle(ChatFormatting.DARK_GREEN), false);
3131
} else {

‎src/main/java/dev/compactmods/machines/command/subcommand/CMUnbindSubcommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import com.mojang.brigadier.exceptions.CommandSyntaxException;
66
import dev.compactmods.machines.CompactMachines;
77
import dev.compactmods.machines.api.core.CMCommands;
8+
import dev.compactmods.machines.api.dimension.CompactDimension;
89
import dev.compactmods.machines.config.ServerConfig;
9-
import dev.compactmods.machines.dimension.Dimension;
1010
import dev.compactmods.machines.i18n.TranslationUtil;
1111
import dev.compactmods.machines.machine.CompactMachineBlockEntity;
1212
import dev.compactmods.machines.tunnel.graph.TunnelConnectionGraph;
@@ -30,7 +30,7 @@ public static LiteralArgumentBuilder<CommandSourceStack> make() {
3030
private static int doUnbind(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
3131
final var server = ctx.getSource().getServer();
3232
final var level = ctx.getSource().getLevel();
33-
final var compactDim = server.getLevel(Dimension.COMPACT_DIMENSION);
33+
final var compactDim = server.getLevel(CompactDimension.LEVEL_KEY);
3434
if (compactDim == null) {
3535
throw new CommandRuntimeException(TranslationUtil.command(CMCommands.LEVEL_NOT_FOUND));
3636
}

‎src/main/java/dev/compactmods/machines/compat/theoneprobe/providers/CompactMachineProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.mojang.authlib.GameProfile;
44
import dev.compactmods.machines.api.core.Constants;
55
import dev.compactmods.machines.api.core.Tooltips;
6-
import dev.compactmods.machines.dimension.Dimension;
6+
import dev.compactmods.machines.api.dimension.CompactDimension;
77
import dev.compactmods.machines.i18n.TranslationUtil;
88
import dev.compactmods.machines.machine.CompactMachineBlock;
99
import dev.compactmods.machines.machine.CompactMachineBlockEntity;
@@ -39,7 +39,7 @@ public void addProbeInfo(ProbeMode probeMode, IProbeInfo info, Player player, Le
3939
if (server == null)
4040
return;
4141

42-
final var compactDim = server.getLevel(Dimension.COMPACT_DIMENSION);
42+
final var compactDim = server.getLevel(CompactDimension.LEVEL_KEY);
4343

4444
final var te = level.getBlockEntity(hitData.getPos());
4545

‎src/main/java/dev/compactmods/machines/core/ServerEventHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.compactmods.machines.core;
22

33
import dev.compactmods.machines.api.core.Constants;
4+
import dev.compactmods.machines.api.dimension.CompactDimension;
45
import dev.compactmods.machines.api.room.upgrade.ILevelLoadedUpgradeListener;
5-
import dev.compactmods.machines.dimension.Dimension;
66
import dev.compactmods.machines.upgrade.RoomUpgradeManager;
77
import net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket;
88
import net.minecraft.network.protocol.game.ClientboundSetBorderSizePacket;
@@ -23,7 +23,7 @@ public class ServerEventHandler {
2323

2424
@SubscribeEvent
2525
public static void onWorldLoaded(final LevelEvent.Load evt) {
26-
if(evt.getLevel() instanceof ServerLevel sl && sl.dimension().equals(Dimension.COMPACT_DIMENSION))
26+
if(evt.getLevel() instanceof ServerLevel sl && sl.dimension().equals(CompactDimension.LEVEL_KEY))
2727
{
2828
final var serv = sl.getServer();
2929
final var owBorder = serv.overworld().getWorldBorder();
@@ -48,7 +48,7 @@ public static void onWorldLoaded(final LevelEvent.Load evt) {
4848
// Fix set compact world border if it was loaded weirdly
4949
cwBorder.setCenter(0, 0);
5050
cwBorder.setSize(WorldBorder.MAX_SIZE);
51-
PacketDistributor.DIMENSION.with(() -> Dimension.COMPACT_DIMENSION)
51+
PacketDistributor.DIMENSION.with(() -> CompactDimension.LEVEL_KEY)
5252
.send(new ClientboundSetBorderSizePacket(cwBorder));
5353

5454
}
@@ -57,15 +57,15 @@ public static void onWorldLoaded(final LevelEvent.Load evt) {
5757
@SubscribeEvent
5858
public static void onPlayerLogin(final PlayerEvent.PlayerLoggedInEvent evt) {
5959
final var player = evt.getEntity();
60-
if(player.level.dimension().equals(Dimension.COMPACT_DIMENSION) && player instanceof ServerPlayer sp) {
60+
if(player.level.dimension().equals(CompactDimension.LEVEL_KEY) && player instanceof ServerPlayer sp) {
6161
// Send a fake world border to the player instead of the "real" one in overworld
6262
sp.connection.send(new ClientboundInitializeBorderPacket(new WorldBorder()));
6363
}
6464
}
6565

6666
@SubscribeEvent
6767
public static void onPlayerDimChange(final PlayerEvent.PlayerChangedDimensionEvent evt) {
68-
if(evt.getTo().equals(Dimension.COMPACT_DIMENSION)) {
68+
if(evt.getTo().equals(CompactDimension.LEVEL_KEY)) {
6969
final var player = evt.getEntity();
7070
if(player instanceof ServerPlayer sp) {
7171
// Send a fake world border to the player instead of the "real" one in overworld

0 commit comments

Comments
 (0)