wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mixin crashes on 1.16.5

Browse Source
This commit is contained in:
s809
2024-09-18 01:06:06 +05:00
parent cd74e33c54
commit 00b69dcc68
8 changed files with 104 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/IMixinServerPlayer.java
+4
View File
@@ -8,4 +8,8 @@ public interface IMixinServerPlayer
@Nullable
ServerLevel distantHorizons$getDimensionChangeDestination();
#if MC_VER == MC_1_16_5
void distantHorizons$setDimensionChangeDestination(ServerLevel dimensionChangeDestination);
#endif
}
coreSubProjects
+1 -1
Submodule coreSubProjects updated: 840b0a7fe2...f7bf05b62f
fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinEntity.java
+38
View File
@@ -0,0 +1,38 @@
#if MC_VER == MC_1_16_5
package com.seibel.distanthorizons.fabric.mixins.server;
import com.seibel.distanthorizons.common.wrappers.misc.IMixinServerPlayer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.Level;
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(Entity.class)
public class MixinEntity
{
@Inject(at = @At("TAIL"), method = "setLevel")
public void setLevel(Level level, CallbackInfo ci)
{
if (this instanceof IMixinServerPlayer)
{
((IMixinServerPlayer) this).distantHorizons$setDimensionChangeDestination((ServerLevel) level);
}
}
}
#else
package com.seibel.distanthorizons.fabric.mixins.server;
import net.minecraft.world.entity.Entity;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(Entity.class)
public class MixinEntity
{
}
#endif
fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinServerPlayer.java
+9 -2
View File
@@ -48,6 +48,12 @@ public class MixinServerPlayer implements IMixinServerPlayer
public ServerLevel distantHorizons$getDimensionChangeDestination()
{ return this.dimensionChangeDestination; }
#if MC_VER == MC_1_16_5
@Override
public void distantHorizons$setDimensionChangeDestination(ServerLevel dimensionChangeDestination)
{ this.dimensionChangeDestination = dimensionChangeDestination; }
#endif
@Inject(at = @At("HEAD"), method = "changeDimension")
#if MC_VER >= MC_1_21_1
public void changeDimension(DimensionTransition dimensionTransition, CallbackInfoReturnable<Entity> cir)
@@ -60,10 +66,11 @@ public class MixinServerPlayer implements IMixinServerPlayer
#if MC_VER >= MC_1_20_1
@Inject(at = @At("RETURN"), method = "setServerLevel")
public void setServerLevel(ServerLevel level, CallbackInfo ci)
#else
{ this.dimensionChangeDestination = null; }
#elif MC_VER >= MC_1_17_1
@Inject(at = @At("RETURN"), method = "setLevel")
public void setLevel(ServerLevel level, CallbackInfo ci)
#endif
{ this.dimensionChangeDestination = null; }
#endif
}
fabric/src/main/resources/DistantHorizons.fabric.mixins.json
+2 -1
View File
@@ -6,7 +6,8 @@
"server.MixinChunkGenerator",
"server.MixinChunkMap",
"server.MixinUtilBackgroundThread",
"server.MixinServerPlayer"
"server.MixinServerPlayer",
"server.MixinEntity"
],
"client": [
"client.MixinClientLevel",
forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinEntity.java
+39
View File
@@ -0,0 +1,39 @@
#if MC_VER == MC_1_16_5
package com.seibel.distanthorizons.forge.mixins.server;
import com.seibel.distanthorizons.common.wrappers.misc.IMixinServerPlayer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.Level;
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(Entity.class)
public class MixinEntity
{
@Inject(at = @At("TAIL"), method = "setLevel")
public void setLevel(Level level, CallbackInfo ci)
{
if (this instanceof IMixinServerPlayer)
{
((IMixinServerPlayer) this).distantHorizons$setDimensionChangeDestination((ServerLevel) level);
}
}
}
#else
package com.seibel.distanthorizons.forge.mixins.server;
import net.minecraft.world.entity.Entity;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(Entity.class)
public class MixinEntity
{
}
#endif
forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinServerPlayer.java
+9 -2
View File
@@ -45,6 +45,12 @@ public class MixinServerPlayer implements IMixinServerPlayer
public ServerLevel distantHorizons$getDimensionChangeDestination()
{ return this.distantHorizons$dimensionChangeDestination; }
#if MC_VER == MC_1_16_5
@Override
public void distantHorizons$setDimensionChangeDestination(ServerLevel dimensionChangeDestination)
{ this.distantHorizons$dimensionChangeDestination = dimensionChangeDestination; }
#endif
@Inject(at = @At("HEAD"), method = "changeDimension", remap = false)
public void changeDimension(ServerLevel destination, ITeleporter teleporter, CallbackInfoReturnable<Entity> cir)
{ this.distantHorizons$dimensionChangeDestination = destination; }
@@ -52,10 +58,11 @@ public class MixinServerPlayer implements IMixinServerPlayer
#if MC_VER >= MC_1_20_1
@Inject(at = @At("RETURN"), method = "setServerLevel")
public void setServerLevel(ServerLevel level, CallbackInfo ci)
#else
{ this.distantHorizons$dimensionChangeDestination = null; }
#elif MC_VER >= MC_1_17_1
@Inject(at = @At("RETURN"), method = "setLevel")
public void setLevel(ServerLevel level, CallbackInfo ci)
#endif
{ this.distantHorizons$dimensionChangeDestination = null; }
#endif
}
forge/src/main/resources/DistantHorizons.forge.mixins.json
+2 -1
View File
@@ -7,7 +7,8 @@
"server.MixinChunkGenerator",
"server.MixinTFChunkGenerator",
"server.MixinChunkMap",
"server.MixinServerPlayer"
"server.MixinServerPlayer",
"server.MixinEntity"
],
"client": [
"client.MixinClientPacketListener",