Skip to content

Commit 0b8887c

Browse files
AlphaModeAlphaMode
committed
chore: port to 1.21
1 parent 00d3e0c commit 0b8887c

File tree

6 files changed

+36
-24
lines changed

6 files changed

+36
-24
lines changed

‎common/src/main/java/dev/galacticraft/dynamicdimensions/impl/Constants.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public interface Constants {
3333
Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
3434
DynamicDimensionsConfig CONFIG = Services.PLATFORM.getConfig();
3535

36-
ResourceLocation CREATE_DIMENSION_PACKET = new ResourceLocation(MOD_ID, "create_dimension");
37-
ResourceLocation REMOVE_DIMENSION_PACKET = new ResourceLocation(MOD_ID, "remove_dimension");
36+
ResourceLocation CREATE_DIMENSION_PACKET = ResourceLocation.fromNamespaceAndPath(MOD_ID, "create_dimension");
37+
ResourceLocation REMOVE_DIMENSION_PACKET = ResourceLocation.fromNamespaceAndPath(MOD_ID, "remove_dimension");
3838
}

‎common/src/main/java/dev/galacticraft/dynamicdimensions/impl/gametest/DynamicDimensionsGametest.java

+25-13
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,14 @@
3636
import net.minecraft.server.level.ServerLevel;
3737
import net.minecraft.tags.BlockTags;
3838
import net.minecraft.util.valueproviders.UniformInt;
39+
import net.minecraft.world.entity.Entity;
40+
import net.minecraft.world.level.Level;
3941
import net.minecraft.world.level.block.Blocks;
42+
import net.minecraft.world.level.border.WorldBorder;
4043
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
4144
import net.minecraft.world.level.dimension.DimensionType;
45+
import net.minecraft.world.level.portal.DimensionTransition;
46+
import net.minecraft.world.phys.Vec3;
4247
import org.apache.commons.io.FileUtils;
4348
import org.jetbrains.annotations.ApiStatus;
4449
import org.jetbrains.annotations.Contract;
@@ -57,12 +62,12 @@
5762
@ApiStatus.Internal
5863
public class DynamicDimensionsGametest {
5964
private static final String EMPTY_STRUCTURE = "empty"; // in minecraft namespace because forge.
60-
private static final ResourceLocation TEST_LEVEL_0 = new ResourceLocation(Constants.MOD_ID, "level_0");
61-
private static final ResourceLocation TEST_LEVEL_1 = new ResourceLocation(Constants.MOD_ID, "level_1");
62-
private static final ResourceLocation TEST_LEVEL_2 = new ResourceLocation(Constants.MOD_ID, "level_2");
63-
private static final ResourceLocation TEST_LEVEL_3 = new ResourceLocation(Constants.MOD_ID, "level_3");
64-
private static final ResourceLocation TEST_LEVEL_4 = new ResourceLocation(Constants.MOD_ID, "level_4");
65-
private static final ResourceLocation TEST_LEVEL_5 = new ResourceLocation(Constants.MOD_ID, "level_5");
65+
private static final ResourceLocation TEST_LEVEL_0 = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "level_0");
66+
private static final ResourceLocation TEST_LEVEL_1 = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "level_1");
67+
private static final ResourceLocation TEST_LEVEL_2 = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "level_2");
68+
private static final ResourceLocation TEST_LEVEL_3 = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "level_3");
69+
private static final ResourceLocation TEST_LEVEL_4 = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "level_4");
70+
private static final ResourceLocation TEST_LEVEL_5 = ResourceLocation.fromNamespaceAndPath(Constants.MOD_ID, "level_5");
6671

6772
/**
6873
* Checks if dimensions can be created.
@@ -87,6 +92,13 @@ public void createDynamicDimension(@NotNull GameTestHelper context) {
8792
});
8893
}
8994

95+
private static DimensionTransition createTransition(ServerLevel level, Entity entity) {
96+
WorldBorder border = level.getWorldBorder();
97+
double scale = DimensionType.getTeleportationScale(level.dimensionType(), level.dimensionType());
98+
BlockPos pos = border.clampToBounds(entity.getX() * scale, entity.getY(), entity.getZ() * scale);
99+
return new DimensionTransition(level, pos.getBottomCenter(), Vec3.ZERO, entity.getYRot(), entity.getXRot(), DimensionTransition.DO_NOTHING);
100+
}
101+
90102
/**
91103
* Checks if dimensions can be unloaded.
92104
* @param context GameTest context
@@ -103,7 +115,7 @@ public void unloadDynamicDimension(@NotNull GameTestHelper context) {
103115
context.runAfterDelay(1, () -> {
104116
ServerLevel level = server.getLevel(ResourceKey.create(Registries.DIMENSION, TEST_LEVEL_1));
105117
assertNotNull(level);
106-
assertTrue(((DynamicDimensionRegistry) server).unloadDynamicDimension(TEST_LEVEL_1, (server1, player) -> player.changeDimension(overworld)));
118+
assertTrue(((DynamicDimensionRegistry) server).unloadDynamicDimension(TEST_LEVEL_1, (server1, player) -> player.changeDimension(createTransition(overworld, player))));
107119
context.runAfterDelay(1, () -> {
108120
ServerLevel level2 = server.getLevel(ResourceKey.create(Registries.DIMENSION, TEST_LEVEL_1));
109121
assertNull(level2);
@@ -143,7 +155,7 @@ public void removedDimensionsDelete(@NotNull GameTestHelper context) {
143155
level.save(null, true, false);
144156
assertTrue(file.isDirectory());
145157

146-
assertTrue(((DynamicDimensionRegistry) server).deleteDynamicDimension(TEST_LEVEL_3, (server1, player) -> player.changeDimension(overworld)));
158+
assertTrue(((DynamicDimensionRegistry) server).deleteDynamicDimension(TEST_LEVEL_3, (server1, player) -> player.changeDimension(createTransition(overworld, player))));
147159
context.runAfterDelay(1, () -> {
148160
ServerLevel level2 = server.getLevel(ResourceKey.create(Registries.DIMENSION, TEST_LEVEL_3));
149161
assertNull(level2);
@@ -184,7 +196,7 @@ public void unloadedDynamicDimensionSaved(@NotNull GameTestHelper context) {
184196
level.save(null, true, false);
185197
assertTrue(file.isDirectory());
186198

187-
assertTrue(((DynamicDimensionRegistry) server).unloadDynamicDimension(TEST_LEVEL_2, (server1, player) -> player.changeDimension(overworld)));
199+
assertTrue(((DynamicDimensionRegistry) server).unloadDynamicDimension(TEST_LEVEL_2, (server1, player) -> player.changeDimension(createTransition(overworld, player))));
188200
context.runAfterDelay(1, () -> {
189201
ServerLevel level2 = server.getLevel(ResourceKey.create(Registries.DIMENSION, TEST_LEVEL_2));
190202
assertNull(level2);
@@ -231,7 +243,7 @@ public void reloadDynamicDimension(@NotNull GameTestHelper context) {
231243
level.save(null, true, false);
232244
assertTrue(file.isDirectory());
233245

234-
assertTrue(((DynamicDimensionRegistry) server).unloadDynamicDimension(TEST_LEVEL_4, (server1, player) -> player.changeDimension(overworld)));
246+
assertTrue(((DynamicDimensionRegistry) server).unloadDynamicDimension(TEST_LEVEL_4, (server1, player) -> player.changeDimension(createTransition(overworld, player))));
235247
context.runAfterDelay(1, () -> {
236248
ServerLevel level2 = server.getLevel(ResourceKey.create(Registries.DIMENSION, TEST_LEVEL_4));
237249
assertNull(level2); // dimension was deleted
@@ -246,7 +258,7 @@ public void reloadDynamicDimension(@NotNull GameTestHelper context) {
246258
assertEquals(level3.getBlockState(BlockPos.ZERO), Blocks.REDSTONE_LAMP.defaultBlockState());
247259

248260
context.succeed();
249-
((DynamicDimensionRegistry) server).deleteDynamicDimension(TEST_LEVEL_4, (server1, player) -> player.changeDimension(overworld));
261+
((DynamicDimensionRegistry) server).deleteDynamicDimension(TEST_LEVEL_4, (server1, player) -> player.changeDimension(createTransition(overworld, player)));
250262
});
251263
});
252264
});
@@ -285,7 +297,7 @@ public void recreateDynamicDimension(@NotNull GameTestHelper context) {
285297
level.save(null, true, false);
286298
assertTrue(file.isDirectory());
287299

288-
assertTrue(((DynamicDimensionRegistry) server).unloadDynamicDimension(TEST_LEVEL_5, (server1, player) -> player.changeDimension(overworld)));
300+
assertTrue(((DynamicDimensionRegistry) server).unloadDynamicDimension(TEST_LEVEL_5, (server1, player) -> player.changeDimension(createTransition(overworld, player))));
289301
context.runAfterDelay(1, () -> {
290302
ServerLevel level2 = server.getLevel(ResourceKey.create(Registries.DIMENSION, TEST_LEVEL_5));
291303
assertNull(level2); // dimension was deleted
@@ -300,7 +312,7 @@ public void recreateDynamicDimension(@NotNull GameTestHelper context) {
300312
assertNotEquals(level3.getBlockState(BlockPos.ZERO), Blocks.REDSTONE_LAMP.defaultBlockState());
301313

302314
context.succeed();
303-
((DynamicDimensionRegistry) server).deleteDynamicDimension(TEST_LEVEL_5, (server1, player) -> player.changeDimension(overworld));
315+
((DynamicDimensionRegistry) server).deleteDynamicDimension(TEST_LEVEL_5, (server1, player) -> player.changeDimension(createTransition(overworld, player)));
304316
});
305317
});
306318
});

‎fabric/src/main/resources/data/minecraft/gametest/structures/empty.snbt ‎fabric/src/main/resources/data/minecraft/gametest/structure/empty.snbt

File renamed without changes.

‎gradle.properties

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ mod.license=MIT
99
mod.version=0.7.0
1010

1111
# Loader dependencies
12-
minecraft.version=1.20.6
13-
fabric.loader.version=0.15.10
14-
forge.version=20.6.2-beta
15-
parchment.version=1.20.3:2023.12.31
12+
minecraft.version=1.21
13+
fabric.loader.version=0.15.11
14+
forge.version=21.0.53-beta
15+
parchment.version=1.21:2024.06.23
1616
# Project metadata
17-
minecraft.version.min=1.20.4
17+
minecraft.version.min=1.21
1818
fabric.loader.version.min=0.15
19-
neoforge.version.min=20.4
19+
neoforge.version.min=21.0
2020

2121
# Universal Dependencies
22-
badpackets.version=0.7.2
22+
badpackets.version=0.8.1
2323

2424
# Fabric dependencies
25-
fabric.api.version=0.97.8+1.20.6
25+
fabric.api.version=0.100.4+1.21
2626
fabric.api.modules=\
2727
fabric-api-base,\
2828
fabric-command-api-v2,\

‎neoforge/src/main/java/dev/galacticraft/dynamicdimensions/impl/forge/DynamicDimensionsForge.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
public final class DynamicDimensionsForge {
4646
public DynamicDimensionsForge(IEventBus modEventBus, Dist dist, ModContainer container) {
4747
NeoForge.EVENT_BUS.addListener(this::registerCommands);
48-
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, DynamicDimensionsConfigImpl.SPEC);
48+
container.registerConfig(ModConfig.Type.COMMON, DynamicDimensionsConfigImpl.SPEC);
4949

5050
if (FMLEnvironment.dist.isClient()) {
5151
DynamicDimensionsS2CPacketReceivers.registerReceivers();

‎neoforge/src/main/resources/data/minecraft/structures/dynamicdimensionsgametest.empty.nbt ‎neoforge/src/main/resources/data/minecraft/structure/dynamicdimensionsgametest.empty.nbt

File renamed without changes.

0 commit comments

Comments
 (0)