-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
24 changed files
with
634 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package AMS.helpers; | ||
|
|
||
| import AMS.mixins.BlockPatternTestTransformInvoker; | ||
|
|
||
| import com.google.common.cache.LoadingCache; | ||
| import net.minecraft.block.pattern.BlockPattern; | ||
| import net.minecraft.block.pattern.CachedBlockPosition; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.util.math.Direction; | ||
| import net.minecraft.world.WorldView; | ||
|
|
||
| public class BlockPatternHelper { | ||
| public static BlockPattern.Result partialSearchAround(BlockPattern pattern, WorldView world, BlockPos pos) { | ||
| LoadingCache<BlockPos, CachedBlockPosition> loadingCache = BlockPattern.makeCache(world, false); | ||
| int i = Math.max(Math.max(pattern.getWidth(), pattern.getHeight()), pattern.getDepth()); | ||
| for (BlockPos blockPos : BlockPos.iterate(pos, pos.add(i - 1, 0, i - 1))) { | ||
| for (Direction direction : Direction.values()) { | ||
| for (Direction direction2 : Direction.values()) { | ||
| BlockPattern.Result result; | ||
| if (direction2 == direction || direction2 == direction.getOpposite() || (result = ((BlockPatternTestTransformInvoker)pattern).invokeTestTransform(blockPos, direction, direction2, loadingCache)) == null) continue; | ||
| return result; | ||
| } | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
src/main/java/AMS/mixins/BlockPatternTestTransformInvoker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package AMS.mixins; | ||
|
|
||
| import com.google.common.cache.LoadingCache; | ||
|
|
||
| import net.minecraft.block.pattern.BlockPattern; | ||
| import net.minecraft.block.pattern.CachedBlockPosition; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.util.math.Direction; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.gen.Invoker; | ||
|
|
||
| @Mixin(BlockPattern.class) | ||
| public interface BlockPatternTestTransformInvoker { | ||
| @Invoker("testTransform") | ||
| BlockPattern.Result invokeTestTransform(BlockPos frontTopLeft, Direction forwards, Direction up, LoadingCache<BlockPos, CachedBlockPosition> cache); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| package AMS.mixins; | ||
|
|
||
| import net.minecraft.block.entity.BlockEntity; | ||
| import net.minecraft.block.entity.EndGatewayBlockEntity; | ||
| import net.minecraft.block.entity.EndPortalBlockEntity; | ||
| import net.minecraft.block.pattern.BlockPattern; | ||
| import net.minecraft.entity.boss.dragon.EnderDragonFight; | ||
| import net.minecraft.entity.decoration.EndCrystalEntity; | ||
| import net.minecraft.server.world.ServerWorld; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.world.Heightmap; | ||
| import net.minecraft.world.chunk.WorldChunk; | ||
| import net.minecraft.world.gen.feature.EndPortalFeature; | ||
|
|
||
| import org.spongepowered.asm.mixin.*; | ||
| import org.jetbrains.annotations.Nullable; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| import taichiCarpet.TaichiCarpetSettings; | ||
|
|
||
| import AMS.helpers.BlockPatternHelper; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @Mixin(value = EnderDragonFight.class, priority = 888) | ||
| public abstract class EnderDragonFightMixin { | ||
|
|
||
| @Shadow | ||
| @Final | ||
| private ServerWorld world; | ||
|
|
||
| @Shadow | ||
| @Final | ||
| private BlockPattern endPortalPattern; | ||
|
|
||
| @Nullable | ||
| @Shadow | ||
| private BlockPos exitPortalLocation; | ||
|
|
||
| @Shadow | ||
| private boolean doLegacyCheck; | ||
|
|
||
| @Unique | ||
| private int cacheChunkIteratorX = -8; | ||
|
|
||
| @Unique | ||
| private int cacheChunkIteratorZ = -8; | ||
|
|
||
| @Unique | ||
| private int cacheOriginIteratorY = -1; | ||
|
|
||
| /** | ||
| * @author WenDavid | ||
| * @reason Optimize the search of end portal | ||
| */ | ||
|
|
||
| @Overwrite | ||
| private @Nullable BlockPattern.Result findEndPortal() { | ||
| int i,j; | ||
| if(!TaichiCarpetSettings.optimizedDragonRespawn) { | ||
| cacheChunkIteratorX = -8; | ||
| cacheChunkIteratorZ = -8; | ||
| } | ||
| for(i = cacheChunkIteratorX; i <= 8; ++i) { | ||
| for(j = cacheChunkIteratorZ; j <= 8; ++j) { | ||
| WorldChunk worldChunk = this.world.getChunk(i, j); | ||
| for(BlockEntity blockEntity : worldChunk.getBlockEntities().values()) { | ||
| if(TaichiCarpetSettings.optimizedDragonRespawn && blockEntity instanceof EndGatewayBlockEntity) continue; | ||
| if (blockEntity instanceof EndPortalBlockEntity) { | ||
| BlockPattern.Result result = this.endPortalPattern.searchAround(this.world, blockEntity.getPos()); | ||
| if (result != null) { | ||
| BlockPos blockPos = result.translate(3, 3, 3).getBlockPos(); | ||
| if (this.exitPortalLocation == null) { | ||
| this.exitPortalLocation = blockPos; | ||
| } | ||
| //No need to judge whether optimizing option is open | ||
| cacheChunkIteratorX = i; | ||
| cacheChunkIteratorZ = j; | ||
| return result; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| if(this.doLegacyCheck || this.exitPortalLocation == null){ | ||
| if(TaichiCarpetSettings.optimizedDragonRespawn && cacheOriginIteratorY != -1) { | ||
| i = cacheOriginIteratorY; | ||
| } | ||
| else { | ||
| i = this.world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, EndPortalFeature.offsetOrigin(BlockPos.ORIGIN)).getY(); | ||
| } | ||
| boolean notFirstSearch = false; | ||
| for(j = i; j >= 0; --j) { | ||
| BlockPattern.Result result2 = null; | ||
| if(TaichiCarpetSettings.optimizedDragonRespawn && notFirstSearch) { | ||
| result2 = BlockPatternHelper.partialSearchAround(this.endPortalPattern, this.world, new BlockPos(EndPortalFeature.offsetOrigin(BlockPos.ORIGIN).getX(), j, EndPortalFeature.offsetOrigin(BlockPos.ORIGIN).getZ())); | ||
| } | ||
| else { | ||
| result2 = this.endPortalPattern.searchAround(this.world, new BlockPos(EndPortalFeature.offsetOrigin(BlockPos.ORIGIN).getX(), j, EndPortalFeature.offsetOrigin(BlockPos.ORIGIN).getZ())); | ||
| } | ||
| if (result2 != null) { | ||
| if (this.exitPortalLocation == null) { | ||
| this.exitPortalLocation = result2.translate(3, 3, 3).getBlockPos(); | ||
| } | ||
| cacheOriginIteratorY = j; | ||
| return result2; | ||
| } | ||
| notFirstSearch = true; | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| @Inject( | ||
| method = "respawnDragon(Ljava/util/List;)V", | ||
| at = @At("HEAD") | ||
| ) | ||
| private void resetCache(List<EndCrystalEntity> crystals, CallbackInfo ci) { | ||
| cacheChunkIteratorX = -8; | ||
| cacheChunkIteratorZ = -8; | ||
| cacheOriginIteratorY = -1; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package chronos.mixins; | ||
|
|
||
| import net.minecraft.entity.Entity; | ||
| import net.minecraft.entity.EntityDimensions; | ||
| import net.minecraft.server.world.ServerWorld; | ||
| import net.minecraft.util.math.Vec3d; | ||
| import net.minecraft.world.dimension.NetherPortal; | ||
| 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.CallbackInfoReturnable; | ||
| import taichiCarpet.TaichiCarpetSettings; | ||
|
|
||
| @Mixin(NetherPortal.class) | ||
| public class NetherPortalMixin { | ||
|
|
||
| @Inject(method = "findOpenPosition", at = @At("HEAD"), cancellable = true) | ||
| private static void cancelCollisionCheck(Vec3d fallback, ServerWorld world, Entity entity, EntityDimensions dimensions, CallbackInfoReturnable<Vec3d> cir) { | ||
| if (TaichiCarpetSettings.disableNetherPortalCollisionCheck) { | ||
| cir.setReturnValue(fallback); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.