icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into future

Browse Source 
# Conflicts:
#	src/main/java/carpet/fakes/ClientSettingsC2SPacketInterface.java
#	src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
This commit is contained in:
gnembon committed 2021-11-27 18:55:05 +01:00
2 parents 5daad2d832 d8c10c6e4a
commit 9750dd9e78
9 files changed
+9 -231
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java
-20
View File
@@ -1,20 +0,0 @@
package carpet.mixins;
import carpet.fakes.ClientSettingsC2SPacketInterface;
import net.minecraft.network.packet.c2s.play.ClientSettingsC2SPacket;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
//@Mixin(ClientSettingsC2SPacket.class)
public class ClientSettingsC2SPacket_scarpetMixin implements ClientSettingsC2SPacketInterface {
/* @Final
@Shadow
private String language;
@Override
public String getLanguage(){
return this.language;
}*/
}
src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
+8 -3
View File
@@ -1,6 +1,5 @@
package carpet.mixins;
import carpet.fakes.ClientSettingsC2SPacketInterface;
import carpet.fakes.EntityInterface;
import carpet.fakes.ServerPlayerEntityInterface;
import carpet.script.EntityEventsGroup;
@@ -19,6 +18,7 @@ import net.minecraft.util.registry.RegistryKey;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
@@ -35,6 +35,7 @@ public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
{
// to denote if the player reference is valid
@Unique
private boolean isInvalidReference = false;
public ServerPlayerEntity_scarpetEventMixin(World world, BlockPos blockPos, float f, GameProfile gameProfile)
@@ -130,14 +131,18 @@ public abstract class ServerPlayerEntity_scarpetEventMixin extends PlayerEntity
}
//getting player language
@Unique
private String language;
public String getLanguage(){
@Override
public String getLanguage()
{
return this.language;
}
@Inject(method = "setClientSettings", at = @At("HEAD"))
public void setClientSettings(ClientSettingsC2SPacket packet, CallbackInfo ci){
public void setLanguage(ClientSettingsC2SPacket packet, CallbackInfo ci)
{
this.language = packet.language();
}
}
src/main/java/carpet/mixins/ServerWorld_fakePlayersMixin.java
-38
View File
@@ -1,38 +0,0 @@
package carpet.mixins;
import carpet.patches.EntityPlayerMPFake;
import net.minecraft.entity.Entity;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerTask;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
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.Redirect;
@Mixin(ServerWorld.class)
public abstract class ServerWorld_fakePlayersMixin
{
@Shadow /*@Nonnull*/ public abstract MinecraftServer getServer();
/*
@Shadow private boolean inEntityTick;
@Redirect( method = "removePlayer", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/server/world/ServerWorld;removeEntity(Lnet/minecraft/entity/Entity;)V"
))
private void crashRemovePlayer(ServerWorld serverWorld, Entity entity_1, ServerPlayerEntity serverPlayerEntity_1)
{
if ( !(serverPlayerEntity_1 instanceof EntityPlayerMPFake) )
serverWorld.removeEntity(entity_1);
else
getServer().send(new ServerTask(getServer().getTicks(), () ->
{
serverWorld.removeEntity(serverPlayerEntity_1);
serverPlayerEntity_1.onTeleportationDone();
}));
}*/
}