-
Notifications
You must be signed in to change notification settings - Fork 104
Optimizes Spell Circles #866
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
471b7ad
Fixed Spell Circle NBT-Storage leak
Stick404 841e644
Cleaned code up from Spell Circle NBT-Fix
Stick404 bc64650
Why did IDEA indent so much?
Stick404 8c051b0
Merge branch 'main' into main
Stick404 3c08dfc
Notes:tm:
Stick404 70c0180
Added some Null safety to reachedNumber
Stick404 faee920
Removed the Chest Inv stuff
Stick404 c485792
re add the .cache
Stick404 4910137
Removed "knownPositions" replaced with 2 BlockPos values
Stick404 2fdf0e3
Spell Circle block flood-find *should* now be optimized more, since i…
Stick404 374c991
Removed unnecessary logger in BlockEntityRedstoneImpetus#getStoredPlayer
Stick404 b0d9292
Forgot saving the Negative and Positive block positions
Stick404 7ba2790
Decreased spell circle scan time
Stick404 2ef2090
Removed comment
Stick404 a0a38fd
Added config limit
Stick404 bd3b424
Added Spell Circle error messages
Stick404 79e7aeb
Cleaned up and generalized existing Spell Circle error messages
Stick404 18b6317
Fixed small problems
Stick404 2e5ae96
Started work on ChunkScanning.kt
Stick404 bceb0e1
Merge remote-tracking branch 'origin/main'
Stick404 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
70 changes: 70 additions & 0 deletions
70
Common/src/main/java/at/petrak/hexcasting/api/utils/ChunkScanning.kt
This file contains hidden or 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,70 @@ | ||
| package at.petrak.hexcasting.api.utils | ||
|
|
||
| import at.petrak.hexcasting.api.HexAPI | ||
| import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap | ||
| import net.minecraft.core.BlockPos | ||
| import net.minecraft.server.level.ServerLevel | ||
| import net.minecraft.world.level.ChunkPos | ||
| import net.minecraft.world.level.block.entity.BlockEntity | ||
| import net.minecraft.world.level.block.state.BlockState | ||
| import net.minecraft.world.level.chunk.ChunkStatus | ||
| import net.minecraft.world.level.chunk.ImposterProtoChunk | ||
|
|
||
| /** | ||
| * This is a helper class to efficiently scan chunks in ways Minecraft did not intend for. This is for only reading chunks, not writing | ||
| * | ||
| * TODO: MAKE DOC THIS BETTER | ||
| */ | ||
| class ChunkScanning(var level: ServerLevel) { | ||
| var chunks: Long2ObjectLinkedOpenHashMap<ImposterProtoChunk> = Long2ObjectLinkedOpenHashMap() | ||
|
|
||
| /** | ||
| * This attempts to cache a chunk to the local [chunks] | ||
| * @param ChunkPos the chunk to try to cache | ||
| * @return If the function could cache the chunk or not | ||
| */ | ||
| fun cacheChunk(chunk: ChunkPos): Boolean { | ||
| val chunkLong = chunk.toLong() | ||
| // We have the chunk already, so we can skip it | ||
| if (chunks.contains(chunkLong)){ | ||
| return true | ||
| } | ||
| val future = level.chunkSource.getChunkFuture(chunk.x,chunk.z, ChunkStatus.EMPTY,true).get() | ||
| if (future.left().isPresent){ | ||
| chunks.put(chunkLong, future.left().get() as ImposterProtoChunk) | ||
| return true | ||
| } | ||
| HexAPI.LOGGER.warn("Failed to get chunk at {}!",chunk) | ||
| return false | ||
| } | ||
|
|
||
| fun cacheChunk(chunk: Long): Boolean{ | ||
| return cacheChunk(ChunkPos(chunk)) | ||
| } | ||
|
|
||
| fun getBlock(blockPos: BlockPos): BlockState? { | ||
| val chunkPos = ChunkPos(blockPos).toLong() | ||
| if (!cacheChunk(chunkPos)){ | ||
| return null | ||
| } | ||
| return chunks.get(chunkPos).getBlockState(blockPos) | ||
| } | ||
|
|
||
| fun getBlockEntity(blockPos: BlockPos): BlockEntity? { | ||
| val chunkPos = ChunkPos(blockPos).toLong() | ||
| if (!cacheChunk(chunkPos)){ | ||
| return null | ||
| } | ||
| return chunks.get(chunkPos).getBlockEntity(blockPos) | ||
| } | ||
|
|
||
| // maybe not required, but still not a bad idea to have a Clear method | ||
| fun clearCache(){ | ||
| chunks.clear() | ||
| } | ||
|
|
||
| // TODO: Might not need this | ||
| fun containsChunk(chunk: ChunkPos): Boolean{ | ||
| return chunks.contains(chunk.toLong()) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.