Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mod world to force cast to server world (#121)

Browse Source 
* Fix mod world to force cast to server world

* Update forge version to 35.1.29
This commit is contained in:
寒兮 2021-01-08 20:08:38 +08:00 committed by GitHub
parent 18ef0518d0
commit 03401a43b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -6,7 +6,7 @@ A Bukkit server implementation utilizing Mixin.
| Minecraft | Forge | Status | Build | | Minecraft | Forge | Status | Build |
| :----: | :----: | :---: | :---: | | :----: | :----: | :---: | :---: |
| 1.16.x | 35.1.28 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) | | 1.16.x | 35.1.29 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) |
| 1.15.x | 31.2.47 | ACTIVE | [![1.15 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-15?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-15) | | 1.15.x | 31.2.47 | ACTIVE | [![1.15 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-15?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-15) |
| 1.14.x | 28.2.0 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.0.6) | [![1.14 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight) | | 1.14.x | 28.2.0 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.0.6) | [![1.14 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight) |

2
arclight-common/build.gradle
View File

@ -21,7 +21,7 @@ apply plugin: 'io.izzel.arclight'
ext { ext {
minecraftVersion = '1.16.4' minecraftVersion = '1.16.4'
forgeVersion = '35.1.28' forgeVersion = '35.1.29'
} }
arclight { arclight {

6
arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/border/WorldBorderBridge.java
View File

@ -1,10 +1,10 @@
package io.izzel.arclight.common.bridge.world.border; package io.izzel.arclight.common.bridge.world.border;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.World;
public interface WorldBorderBridge { public interface WorldBorderBridge {
ServerWorld bridge$getWorld(); World bridge$getWorld();
void bridge$setWorld(ServerWorld world); void bridge$setWorld(World world);
} }

2
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/WorldMixin.java
View File

@ -88,7 +88,7 @@ public abstract class WorldMixin implements WorldBridge {
@Inject(method = "<init>(Lnet/minecraft/world/storage/ISpawnWorldInfo;Lnet/minecraft/util/RegistryKey;Lnet/minecraft/world/DimensionType;Ljava/util/function/Supplier;ZZJ)V", at = @At("RETURN")) @Inject(method = "<init>(Lnet/minecraft/world/storage/ISpawnWorldInfo;Lnet/minecraft/util/RegistryKey;Lnet/minecraft/world/DimensionType;Ljava/util/function/Supplier;ZZJ)V", at = @At("RETURN"))
private void arclight$init(ISpawnWorldInfo info, RegistryKey<World> dimension, DimensionType dimType, Supplier<IProfiler> profiler, boolean isRemote, boolean isDebug, long seed, CallbackInfo ci) { private void arclight$init(ISpawnWorldInfo info, RegistryKey<World> dimension, DimensionType dimType, Supplier<IProfiler> profiler, boolean isRemote, boolean isDebug, long seed, CallbackInfo ci) {
this.spigotConfig = new SpigotWorldConfig(((IServerWorldInfo) info).getWorldName()); this.spigotConfig = new SpigotWorldConfig(((IServerWorldInfo) info).getWorldName());
((WorldBorderBridge) this.worldBorder).bridge$setWorld((ServerWorld) (Object) this); ((WorldBorderBridge) this.worldBorder).bridge$setWorld((World) (Object) this);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns();
this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns();
this.ticksPerWaterSpawns = this.getServer().getTicksPerWaterSpawns(); this.ticksPerWaterSpawns = this.getServer().getTicksPerWaterSpawns();

8
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/border/WorldBorderMixin.java
View File

@ -2,21 +2,21 @@ package io.izzel.arclight.common.mixin.core.world.border;
import io.izzel.arclight.common.bridge.world.border.WorldBorderBridge; import io.izzel.arclight.common.bridge.world.border.WorldBorderBridge;
import net.minecraft.world.border.WorldBorder; import net.minecraft.world.border.WorldBorder;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@Mixin(WorldBorder.class) @Mixin(WorldBorder.class)
public class WorldBorderMixin implements WorldBorderBridge { public class WorldBorderMixin implements WorldBorderBridge {
public ServerWorld world; public World world;
@Override @Override
public ServerWorld bridge$getWorld() { public World bridge$getWorld() {
return this.world; return this.world;
} }
@Override @Override
public void bridge$setWorld(ServerWorld world) { public void bridge$setWorld(World world) {
this.world = world; this.world = world;
} }
} }

2
arclight-forge-1.16/build.gradle
View File

@ -22,7 +22,7 @@ apply plugin: 'maven-publish'
ext { ext {
minecraftVersion = '1.16.4' minecraftVersion = '1.16.4'
forgeVersion = '35.1.28' forgeVersion = '35.1.29'
} }
arclight { arclight {