Skip to content

Commit ab0b0aa

Browse files
AlphaModeAlphaMode
committed
chore: redo 1.20.6 port (neo forge works)
1 parent 1548787 commit ab0b0aa

File tree

5 files changed

+22
-19
lines changed

5 files changed

+22
-19
lines changed

‎build.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("org.ajoberstar.grgit") version ("5.2.1")
33
id("org.cadixdev.licenser") version("0.6.1") apply(false)
4-
id("fabric-loom") version("1.5-SNAPSHOT") apply(false)
4+
id("fabric-loom") version("1.6-SNAPSHOT") apply(false)
55
id("org.jetbrains.gradle.plugin.idea-ext") version("1.1.7") // required for neoforge
66
}
77

@@ -52,9 +52,9 @@ subprojects {
5252
val badpackets = project.property("badpackets.version").toString()
5353

5454
extensions.configure<JavaPluginExtension> {
55-
toolchain.languageVersion.set(JavaLanguageVersion.of(17))
56-
targetCompatibility = JavaVersion.VERSION_17
57-
sourceCompatibility = JavaVersion.VERSION_17
55+
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
56+
targetCompatibility = JavaVersion.VERSION_21
57+
sourceCompatibility = JavaVersion.VERSION_21
5858

5959
withJavadocJar()
6060
withSourcesJar()
@@ -107,7 +107,7 @@ subprojects {
107107

108108
tasks.withType<JavaCompile> {
109109
options.encoding = "UTF-8"
110-
options.release.set(17)
110+
options.release.set(21)
111111
}
112112

113113
tasks.withType<ProcessResources> {
@@ -122,7 +122,7 @@ subprojects {
122122
"min_neoforge" to project.property("neoforge.version.min"),
123123
)
124124

125-
filesMatching(listOf("pack.mcmeta", "fabric.mod.json", "META-INF/mods.toml", "*.mixins.json")) {
125+
filesMatching(listOf("pack.mcmeta", "fabric.mod.json", "META-INF/neoforge.mods.toml", "*.mixins.json")) {
126126
expand(properties)
127127
}
128128
inputs.properties(properties);

‎common/src/main/java/dev/galacticraft/dynamicdimensions/api/PlayerRemover.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ public interface PlayerRemover {
4646
player.teleportTo(level, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, player.getYRot(), player.getXRot());
4747
} else {
4848
LevelData levelData = level.getLevelData();
49-
player.teleportTo(level, levelData.getXSpawn() + 0.5, levelData.getYSpawn(), levelData.getZSpawn() + 0.5, player.getYRot(), player.getXRot());
49+
BlockPos spawnPos = levelData.getSpawnPos();
50+
player.teleportTo(level, spawnPos.getX() + 0.5, spawnPos.getY(), spawnPos.getZ() + 0.5, levelData.getSpawnAngle(), player.getXRot());
5051
}
5152
} else {
5253
level = server.overworld();
5354
LevelData levelData = level.getLevelData();
54-
player.teleportTo(level, levelData.getXSpawn() + 0.5, levelData.getYSpawn(), levelData.getZSpawn() + 0.5, player.getYRot(), player.getXRot());
55+
BlockPos spawnPos = levelData.getSpawnPos();
56+
player.teleportTo(level, spawnPos.getX() + 0.5, spawnPos.getY(), spawnPos.getZ() + 0.5, levelData.getSpawnAngle(), player.getXRot());
5557
}
5658
player.setDeltaMovement(0.0, 0.0, 0.0);
5759
};

‎common/src/main/java/dev/galacticraft/dynamicdimensions/impl/client/network/DynamicDimensionsS2CPacketReceivers.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,17 @@
3737

3838
public final class DynamicDimensionsS2CPacketReceivers {
3939
public static void registerReceivers() {
40-
PlayPackets.registerClientReceiver(Constants.CREATE_DIMENSION_PACKET, (client, handler, buf, responseSender) -> createDynamicDimension(client, handler, buf));
41-
PlayPackets.registerClientReceiver(Constants.REMOVE_DIMENSION_PACKET, (client, handler, buf, responseSender) -> removeDynamicDimension(client, handler, buf));
40+
PlayPackets.registerClientChannel(Constants.CREATE_DIMENSION_PACKET);
41+
PlayPackets.registerClientChannel(Constants.REMOVE_DIMENSION_PACKET);
42+
PlayPackets.registerClientReceiver(Constants.CREATE_DIMENSION_PACKET, (context, buf) -> createDynamicDimension(context.client(), context.handler(), buf));
43+
PlayPackets.registerClientReceiver(Constants.REMOVE_DIMENSION_PACKET, (context, buf) -> removeDynamicDimension(context.client(), context.handler(), buf));
4244
}
4345

4446
private static void createDynamicDimension(@NotNull Minecraft client, @NotNull ClientPacketListener handler, @NotNull FriendlyByteBuf buf) {
4547
ResourceLocation id = buf.readResourceLocation();
46-
int rawId = buf.readInt();
47-
DimensionType type = DimensionType.DIRECT_CODEC.decode(NbtOps.INSTANCE, buf.readNbt()).get().orThrow().getFirst();
48+
DimensionType type = DimensionType.DIRECT_CODEC.decode(NbtOps.INSTANCE, buf.readNbt()).getOrThrow().getFirst();
4849
client.execute(() -> {
49-
RegistryUtil.registerUnfreezeExact(handler.registryAccess().registryOrThrow(Registries.DIMENSION_TYPE), rawId, id, type);
50+
RegistryUtil.registerUnfreezeExact(handler.registryAccess().registryOrThrow(Registries.DIMENSION_TYPE), id, type);
5051
handler.levels().add(ResourceKey.create(Registries.DIMENSION, id));
5152
});
5253
}

‎common/src/main/java/dev/galacticraft/dynamicdimensions/impl/command/DynamicDimensionsCommands.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public static void register(@NotNull CommandDispatcher<CommandSourceStack> dispa
7979
.executes(ctx -> {
8080
ResourceLocation id = ResourceLocationArgument.getId(ctx, "id");
8181
RegistryOps<Tag> ops = RegistryOps.create(NbtOps.INSTANCE, ctx.getSource().registryAccess());
82-
ChunkGenerator generator = ChunkGenerator.CODEC.decode(ops, CompoundTagArgument.getCompoundTag(ctx, "chunk_generator")).get().orThrow().getFirst();
83-
DimensionType type = DimensionType.DIRECT_CODEC.decode(ops, CompoundTagArgument.getCompoundTag(ctx, "dimension_type")).get().orThrow().getFirst();
82+
ChunkGenerator generator = ChunkGenerator.CODEC.decode(ops, CompoundTagArgument.getCompoundTag(ctx, "chunk_generator")).getOrThrow().getFirst();
83+
DimensionType type = DimensionType.DIRECT_CODEC.decode(ops, CompoundTagArgument.getCompoundTag(ctx, "dimension_type")).getOrThrow().getFirst();
8484
DynamicDimensionRegistry from = DynamicDimensionRegistry.from(ctx.getSource().getServer());
8585
if (from.anyDimensionExists(id)) {
8686
throw CANNOT_CREATE.create();
@@ -111,8 +111,8 @@ public static void register(@NotNull CommandDispatcher<CommandSourceStack> dispa
111111
.executes(ctx -> {
112112
ResourceLocation id = ResourceLocationArgument.getId(ctx, "id");
113113
RegistryOps<Tag> ops = RegistryOps.create(NbtOps.INSTANCE, ctx.getSource().registryAccess());
114-
ChunkGenerator generator = ChunkGenerator.CODEC.decode(ops, CompoundTagArgument.getCompoundTag(ctx, "chunk_generator")).get().orThrow().getFirst();
115-
DimensionType type = DimensionType.DIRECT_CODEC.decode(ops, CompoundTagArgument.getCompoundTag(ctx, "dimension_type")).get().orThrow().getFirst();
114+
ChunkGenerator generator = ChunkGenerator.CODEC.decode(ops, CompoundTagArgument.getCompoundTag(ctx, "chunk_generator")).getOrThrow().getFirst();
115+
DimensionType type = DimensionType.DIRECT_CODEC.decode(ops, CompoundTagArgument.getCompoundTag(ctx, "dimension_type")).getOrThrow().getFirst();
116116
DynamicDimensionRegistry from = DynamicDimensionRegistry.from(ctx.getSource().getServer());
117117
if (from.anyDimensionExists(id)) {
118118
throw CANNOT_CREATE.create();

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)