Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-26 05:08:34 +01:00
Code Issues Projects Releases Wiki Activity

Possibly fixed lag related to #235

Browse source
This commit is contained in:
Ell 2021-12-29 22:00:52 +01:00
parent 13e6307921
commit 716350e788
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/de/ellpeck/naturesaura/Helper.java
View file

@ -2,6 +2,7 @@ package de.ellpeck.naturesaura;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.datafixers.util.Either;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.container.IAuraContainer; import de.ellpeck.naturesaura.api.aura.container.IAuraContainer;
import de.ellpeck.naturesaura.api.aura.item.IAuraRecharge; import de.ellpeck.naturesaura.api.aura.item.IAuraRecharge;
@ -14,6 +15,8 @@ import net.minecraft.client.Minecraft;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ChunkHolder;
import net.minecraft.server.level.ServerChunkCache;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource; import net.minecraft.sounds.SoundSource;
@ -31,6 +34,8 @@ import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.level.block.state.properties.Property;
import net.minecraft.world.level.chunk.ChunkAccess;
import net.minecraft.world.level.chunk.ChunkStatus;
import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
@ -51,6 +56,7 @@ import javax.annotation.Nullable;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Predicate; import java.util.function.Predicate;
@ -95,13 +101,13 @@ public final class Helper {
return frames; return frames;
} }
public static LevelChunk getLoadedChunk(LevelAccessor level, int x, int z) { public static ChunkAccess getLoadedChunk(LevelAccessor level, int x, int z) {
// DO NOT EDIT PLEASE FOR THE LOVE OF GOD // thanks DrCat https://github.com/ldtteam/minecolonies/blob/version/1.18/src/api/java/com/minecolonies/api/util/WorldUtil.java#L66
// This is very finicky and easily causes the game to hang for some reason if (level.getChunkSource() instanceof ServerChunkCache cache) {
var provider = level.getChunkSource(); var future = cache.getChunkFuture(x, z, ChunkStatus.FULL, false);
if (provider.hasChunk(x, z)) return future.isDone() ? future.getNow(ChunkHolder.UNLOADED_CHUNK).left().orElse(null) : null;
return provider.getChunk(x, z, false); }
return null; return level.getChunk(x, z, ChunkStatus.FULL, false);
} }
public static int blendColors(int c1, int c2, float ratio) { public static int blendColors(int c1, int c2, float ratio) {

4
src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java
View file

@ -147,9 +147,9 @@ public class CommonEvents {
private boolean handleChunkWatchDeferred(Player player, ChunkPos pos) { private boolean handleChunkWatchDeferred(Player player, ChunkPos pos) {
var chunk = Helper.getLoadedChunk(player.level, pos.x, pos.z); var chunk = Helper.getLoadedChunk(player.level, pos.x, pos.z);
if (chunk == null) if (!(chunk instanceof LevelChunk levelChunk))
return false; return false;
var auraChunk = (AuraChunk) chunk.getCapability(NaturesAuraAPI.CAP_AURA_CHUNK, null).orElse(null); var auraChunk = (AuraChunk) levelChunk.getCapability(NaturesAuraAPI.CAP_AURA_CHUNK, null).orElse(null);
if (auraChunk == null) if (auraChunk == null)
return false; return false;
PacketHandler.sendTo(player, auraChunk.makePacket()); PacketHandler.sendTo(player, auraChunk.makePacket());