-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into backup-only-claimed-chunks
- Loading branch information
Showing
11 changed files
with
168 additions
and
79 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
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
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
44 changes: 0 additions & 44 deletions
44
src/main/java/serverutils/net/MessageJourneyMapRemove.java
This file was deleted.
Oops, something went wrong.
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
54 changes: 54 additions & 0 deletions
54
src/main/java/serverutils/net/MessageNavigatorUpdateKnown.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,54 @@ | ||
| package serverutils.net; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
|
|
||
| import com.gtnewhorizon.gtnhlib.util.CoordinatePacker; | ||
|
|
||
| import cpw.mods.fml.relauncher.Side; | ||
| import cpw.mods.fml.relauncher.SideOnly; | ||
| import it.unimi.dsi.fastutil.longs.LongOpenHashSet; | ||
| import it.unimi.dsi.fastutil.longs.LongSet; | ||
| import serverutils.integration.navigator.NavigatorIntegration; | ||
| import serverutils.lib.io.DataIn; | ||
| import serverutils.lib.io.DataOut; | ||
| import serverutils.lib.net.MessageToClient; | ||
| import serverutils.lib.net.NetworkWrapper; | ||
|
|
||
| public class MessageNavigatorUpdateKnown extends MessageToClient { | ||
|
|
||
| private LongSet toRemove; | ||
|
|
||
| public MessageNavigatorUpdateKnown() {} | ||
|
|
||
| public MessageNavigatorUpdateKnown(@Nonnull LongSet toRemove) { | ||
| this.toRemove = toRemove; | ||
| } | ||
|
|
||
| @Override | ||
| public NetworkWrapper getWrapper() { | ||
| return ServerUtilitiesNetHandler.CLAIMS; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeData(DataOut data) { | ||
| for (long pos : toRemove) { | ||
| data.writeLong(pos); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void readData(DataIn data) { | ||
| toRemove = new LongOpenHashSet(); | ||
| while (data.isReadable()) { | ||
| toRemove.add(data.readLong()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public void onMessage() { | ||
| for (long pos : toRemove) { | ||
| NavigatorIntegration.removeChunk(CoordinatePacker.unpackX(pos), CoordinatePacker.unpackZ(pos)); | ||
| } | ||
| } | ||
| } |
65 changes: 65 additions & 0 deletions
65
src/main/java/serverutils/net/MessageNavigatorValidateKnown.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,65 @@ | ||
| package serverutils.net; | ||
|
|
||
| import net.minecraft.entity.player.EntityPlayerMP; | ||
|
|
||
| import it.unimi.dsi.fastutil.longs.LongOpenHashSet; | ||
| import it.unimi.dsi.fastutil.longs.LongSet; | ||
| import serverutils.ServerUtilitiesPermissions; | ||
| import serverutils.data.ClaimedChunk; | ||
| import serverutils.data.ClaimedChunks; | ||
| import serverutils.lib.io.DataIn; | ||
| import serverutils.lib.io.DataOut; | ||
| import serverutils.lib.math.ChunkDimPos; | ||
| import serverutils.lib.net.MessageToServer; | ||
| import serverutils.lib.net.NetworkWrapper; | ||
| import serverutils.lib.util.permission.PermissionAPI; | ||
|
|
||
| public class MessageNavigatorValidateKnown extends MessageToServer { | ||
|
|
||
| private LongSet knownPositions; | ||
|
|
||
| public MessageNavigatorValidateKnown() {} | ||
|
|
||
| public MessageNavigatorValidateKnown(LongSet knownPositions) { | ||
| this.knownPositions = knownPositions; | ||
| } | ||
|
|
||
| @Override | ||
| public NetworkWrapper getWrapper() { | ||
| return ServerUtilitiesNetHandler.CLAIMS; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeData(DataOut data) { | ||
| for (long pos : knownPositions) { | ||
| data.writeLong(pos); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void readData(DataIn data) { | ||
| knownPositions = new LongOpenHashSet(); | ||
| while (data.isReadable()) { | ||
| knownPositions.add(data.readLong()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onMessage(EntityPlayerMP player) { | ||
| if (knownPositions.isEmpty()) return; | ||
| if (ClaimedChunks.isActive() | ||
| && PermissionAPI.hasPermission(player, ServerUtilitiesPermissions.CLAIMS_JOURNEYMAP)) { | ||
| LongSet toRemove = new LongOpenHashSet(); | ||
| ChunkDimPos mut = new ChunkDimPos(); | ||
| for (long pos : knownPositions) { | ||
| ClaimedChunk chunk = ClaimedChunks.instance.getChunk(mut.set(pos, player.dimension)); | ||
|
|
||
| if (chunk == null) { | ||
| toRemove.add(pos); | ||
| } | ||
| } | ||
| if (toRemove.isEmpty()) return; | ||
| new MessageNavigatorUpdateKnown(toRemove).sendTo(player); | ||
| } | ||
| } | ||
| } |
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