refactored nonscarpet references yeet
This commit is contained in:
1 parent
e4c090c355
commit
2ff1f4fb71
22 files changed
+409
-401
No files matched your search
@@ -1,10 +1,13 @@
|
||||
package carpet.mixins;
|
||||
|
||||
import carpet.CarpetServer;
|
||||
import carpet.fakes.ServerPlayerInterface;
|
||||
import carpet.script.external.Vanilla;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.server.players.PlayerList;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
@@ -15,6 +18,8 @@ import static carpet.script.CarpetEventServer.Event.PLAYER_RESPAWNS;
|
||||
@Mixin(PlayerList.class)
|
||||
public class PlayerList_scarpetEventsMixin
|
||||
{
|
||||
@Shadow @Final private MinecraftServer server;
|
||||
|
||||
@Inject(method = "respawn", at = @At("HEAD"))
|
||||
private void onRespawn(ServerPlayer player, boolean olive, CallbackInfoReturnable<ServerPlayer> cir)
|
||||
{
|
||||
@@ -33,6 +38,6 @@ public class PlayerList_scarpetEventsMixin
|
||||
@Inject(method = "reloadResources", at = @At("HEAD"))
|
||||
private void reloadCommands(CallbackInfo ci)
|
||||
{
|
||||
CarpetServer.scriptServer.reAddCommands();
|
||||
Vanilla.MinecraftServer_getScriptServer(server).reAddCommands();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user