mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-01-30 12:51:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove superclasses of mixins where not needed

Browse Source
This commit is contained in:
Octavia Togami 2021-01-04 14:15:52 -08:00
parent 98c4580db9
commit 5201538608
No known key found for this signature in database
GPG Key ID: 36855DB2BA11CF6C
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/AccessorLevelProperties.java
View File

@ -19,7 +19,6 @@
package com.sk89q.worldedit.fabric.mixin;
import net.minecraft.world.SaveProperties;
import net.minecraft.world.gen.GeneratorOptions;
import net.minecraft.world.level.LevelProperties;
import org.spongepowered.asm.mixin.Mixin;
@ -27,7 +26,7 @@
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(LevelProperties.class)
public interface AccessorLevelProperties extends SaveProperties {
public interface AccessorLevelProperties {
@Accessor
@Mutable

8
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinMinecraftServer.java
View File

@ -23,9 +23,7 @@
import com.sk89q.worldedit.fabric.internal.ExtendedMinecraftServer;
import net.minecraft.resource.ServerResourceManager;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerTask;
import net.minecraft.util.Util;
import net.minecraft.util.thread.ReentrantThreadExecutor;
import net.minecraft.world.World;
import net.minecraft.world.level.storage.LevelStorage;
import org.spongepowered.asm.mixin.Mixin;
@ -35,11 +33,7 @@
import java.nio.file.Path;
@Mixin(MinecraftServer.class)
public abstract class MixinMinecraftServer extends ReentrantThreadExecutor<ServerTask> implements Watchdog, ExtendedMinecraftServer {
public MixinMinecraftServer(String name) {
super(name);
}
public abstract class MixinMinecraftServer implements Watchdog, ExtendedMinecraftServer {
@Shadow
private long timeReference;

10
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/mixin/MixinServerPlayerEntity.java
View File

@ -19,27 +19,19 @@
package com.sk89q.worldedit.fabric.mixin;
import com.mojang.authlib.GameProfile;
import com.sk89q.worldedit.fabric.internal.ExtendedPlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.network.packet.c2s.play.ClientSettingsC2SPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ServerPlayerEntity.class)
public abstract class MixinServerPlayerEntity extends PlayerEntity implements ExtendedPlayerEntity {
public abstract class MixinServerPlayerEntity implements ExtendedPlayerEntity {
private String language = "en_us";
public MixinServerPlayerEntity(World world, BlockPos blockPos, float yaw, GameProfile gameProfile) {
super(world, blockPos, yaw, gameProfile);
}
@Inject(method = "setClientSettings", at = @At(value = "HEAD"))
public void setClientSettings(ClientSettingsC2SPacket clientSettingsC2SPacket,
CallbackInfo callbackInfo) {