Skip to content

Commit 2c92eb6

Browse files
committed
port to 1.21.9-1.21.10
1 parent 1ca1f7e commit 2c92eb6

20 files changed

Lines changed: 262 additions & 7 deletions

File tree

1.19-1.21.7/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java renamed to 1.19-1.21.8/src/main/java/net/set/spawn/mod/mixin/MinecraftServerMixin.java

File renamed without changes.

1.19-1.21.7/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java renamed to 1.19-1.21.8/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

File renamed without changes.

1.19-1.21.7/src/main/resources/assets/setspawnmod/icon.png renamed to 1.19-1.21.8/src/main/resources/assets/setspawnmod/icon.png

File renamed without changes.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"schemaVersion": 1,
3+
"id": "setspawnmod",
4+
"version": "${version}",
5+
"name": "Set Spawn",
6+
"description": "Sets the player's spawnpoint in SSG to specified coordinates.",
7+
"authors": [
8+
{
9+
"name": "bdamja",
10+
"contact": {
11+
"homepage": "https://github.com/bdamja"
12+
}
13+
}
14+
],
15+
"contributors": [
16+
"Void_X_Walker",
17+
"jan-leila",
18+
"RedLime",
19+
"tildejustin",
20+
"contaria"
21+
],
22+
"contact": {
23+
"homepage": "https://github.com/Minecraft-Java-Edition-Speedrunning/set-spawn",
24+
"sources": "https://github.com/Minecraft-Java-Edition-Speedrunning/set-spawn",
25+
"issues": "https://github.com/Minecraft-Java-Edition-Speedrunning/set-spawn/issues"
26+
},
27+
"license": "LGPL-3.0-only",
28+
"icon": "assets/setspawnmod/icon.png",
29+
"environment": "*",
30+
"mixins": [
31+
"setspawnmod.mixins.json"
32+
],
33+
"depends": {
34+
"fabricloader": ">=0.15.0",
35+
"minecraft": ">1.18.2 <1.21.9"
36+
},
37+
"breaks": {
38+
"worldpreview": "<6.0"
39+
}
40+
}

1.19-1.21.7/src/main/resources/setspawnmod.mixins.json renamed to 1.19-1.21.8/src/main/resources/setspawnmod.mixins.json

File renamed without changes.

1.21.9-1.21.10/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
plugins {
2+
id "loom"
3+
}
4+
5+
dependencies {
6+
minecraft "com.mojang:minecraft:$minecraft_version"
7+
mappings "net.fabricmc:yarn:$yarn_mappings:v2"
8+
include implementation(project(path: ":", configuration: "namedElements"))
9+
}

1.21.9-1.21.10/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
minecraft_version=1.21.10
2+
yarn_mappings=1.21.10+build.2
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package net.set.spawn.mod.mixin;
2+
3+
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
4+
import net.minecraft.server.MinecraftServer;
5+
import net.set.spawn.mod.interfaces.MinecraftServerExtended;
6+
import org.spongepowered.asm.mixin.*;
7+
import org.spongepowered.asm.mixin.injection.At;
8+
9+
@Mixin(MinecraftServer.class)
10+
public abstract class MinecraftServerMixin implements MinecraftServerExtended {
11+
@Unique
12+
private boolean shouldModifySpawn = false;
13+
14+
@Unique
15+
private String setSpawnError;
16+
17+
@ModifyExpressionValue(method = "createWorlds", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/ServerWorldProperties;isInitialized()Z"), require = 0)
18+
private boolean checkIfNewWorld(boolean initialized) {
19+
this.shouldModifySpawn = !initialized;
20+
return initialized;
21+
}
22+
23+
@Override
24+
public boolean setspawnmod$shouldModifySpawn() {
25+
return shouldModifySpawn;
26+
}
27+
28+
@Override
29+
public void setspawnmod$setShouldModifySpawn(boolean shouldModifySpawn) {
30+
this.shouldModifySpawn = shouldModifySpawn;
31+
}
32+
33+
@Override
34+
public void setspawnmod$setError(String error) {
35+
this.setSpawnError = error;
36+
}
37+
38+
@Override
39+
public String setspawnmod$getError() {
40+
return this.setSpawnError;
41+
}
42+
}

0 commit comments

Comments
 (0)