Skip to content
This repository was archived by the owner on Sep 8, 2023. It is now read-only.

Commit 105b663

Browse files
committed
move wip wg code to other branch.
1 parent 18068df commit 105b663

3 files changed

Lines changed: 2 additions & 103 deletions

File tree

src/main/java/com/worldql/client/WorldQLClient.java

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
package com.worldql.client;
22

3-
import com.sk89q.worldedit.bukkit.BukkitAdapter;
4-
import com.sk89q.worldedit.math.BlockVector3;
5-
import com.sk89q.worldguard.WorldGuard;
6-
import com.sk89q.worldguard.protection.managers.RegionManager;
7-
import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
8-
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
9-
import com.sk89q.worldguard.protection.regions.RegionContainer;
3+
import com.worldql.client.listeners.NotImplementedCanceller;
4+
import com.worldql.client.listeners.OutgoingPlayerHitListener;
105
import com.worldql.client.listeners.chunks.ChunkLoadEventListener;
116
import com.worldql.client.listeners.chunks.ChunkUnloadEventListener;
127
import com.worldql.client.listeners.explosions.EntityExplodeEventListener;
@@ -21,9 +16,6 @@
2116
import com.worldql.client.serialization.Instruction;
2217
import com.worldql.client.serialization.Message;
2318
import org.bukkit.Bukkit;
24-
25-
import com.worldql.client.listeners.*;
26-
import org.bukkit.World;
2719
import org.bukkit.entity.Player;
2820
import org.bukkit.plugin.java.JavaPlugin;
2921
import org.zeromq.SocketType;
@@ -117,25 +109,6 @@ public void run() {
117109
118110
*/
119111

120-
try {
121-
// TODO: Load from config file.
122-
World world = Bukkit.getWorld("world");
123-
RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
124-
RegionManager regions = container.get(BukkitAdapter.adapt(world));
125-
126-
ProtectedRegion r = regions.getRegion("default_deny_area");
127-
if (r == null) {
128-
BlockVector3 min = BlockVector3.at(-2000, world.getMinHeight(), -2000);
129-
BlockVector3 max = BlockVector3.at(2000, world.getMaxHeight(), 2000);
130-
r = new ProtectedCuboidRegion("default_deny_area", min, max);
131-
regions.addRegion(r);
132-
}
133-
WorldQLClient.getPluginInstance().getLogger().info("Created default WorldGuard protection region.");
134-
135-
} catch (Exception e) {
136-
System.out.println("Did not initialize default protected WorldGuard region.");
137-
}
138-
139112
zeroMQThread = new Thread(new ZeroMQServer(this, context, selfHostname));
140113
zeroMQThread.start();
141114
}

src/main/java/com/worldql/client/ZeroMQServer.java

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
package com.worldql.client;
22

3-
import com.google.gson.Gson;
4-
import com.google.gson.JsonObject;
5-
import com.google.gson.JsonParser;
6-
import com.sk89q.worldedit.bukkit.BukkitAdapter;
7-
import com.sk89q.worldedit.math.BlockVector3;
8-
import com.sk89q.worldguard.WorldGuard;
9-
import com.sk89q.worldguard.domains.DefaultDomain;
10-
import com.sk89q.worldguard.protection.flags.Flags;
11-
import com.sk89q.worldguard.protection.managers.RegionManager;
12-
import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
13-
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
14-
import com.sk89q.worldguard.protection.regions.RegionContainer;
153
import com.worldql.client.ghost.PlayerGhostManager;
164
import com.worldql.client.listeners.player.PlayerChatListener;
175
import com.worldql.client.listeners.player.PlayerDeathListener;
@@ -20,24 +8,12 @@
208
import com.worldql.client.serialization.Instruction;
219
import com.worldql.client.serialization.Message;
2210
import com.worldql.client.serialization.Replication;
23-
import net.kyori.adventure.text.TextComponent;
24-
import org.bukkit.Bukkit;
25-
import org.bukkit.ChatColor;
26-
import org.bukkit.RegionAccessor;
27-
import org.bukkit.World;
28-
import org.bukkit.block.Block;
2911
import org.bukkit.plugin.Plugin;
3012
import org.zeromq.SocketType;
3113
import org.zeromq.ZContext;
3214
import org.zeromq.ZMQ;
3315
import org.zeromq.ZMQException;
3416

35-
import java.io.UnsupportedEncodingException;
36-
import java.nio.ByteBuffer;
37-
import java.nio.charset.Charset;
38-
import java.nio.charset.StandardCharsets;
39-
import java.util.UUID;
40-
4117
public class ZeroMQServer implements Runnable {
4218
private final Plugin plugin;
4319
private final ZContext context;
@@ -88,53 +64,6 @@ public void run() {
8864
if (incoming.parameter().equals("MinecraftPlayerDeath")) {
8965
PlayerDeathListener.handleIncomingDeath(incoming, isSelf);
9066
}
91-
92-
if (incoming.parameter().equals("WorldGuardPlayerClaimRegion")) {
93-
WorldQLClient.getPluginInstance().getLogger().info("Incoming region claim message.");
94-
String json = StandardCharsets.UTF_8.decode(incoming.flex()).toString();
95-
96-
Gson gson = new Gson();
97-
JsonObject o = gson.fromJson(json, JsonObject.class);
98-
String messageToBroadcast = o.get("broadcast_message").getAsString();
99-
try {
100-
World world = Bukkit.getWorld(incoming.worldName());
101-
RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
102-
RegionManager regions = container.get(BukkitAdapter.adapt(world));
103-
int minX = o.get("min_x").getAsInt();
104-
int maxX = o.get("max_x").getAsInt();
105-
int minZ = o.get("min_z").getAsInt();
106-
int maxZ = o.get("max_z").getAsInt();
107-
int minHeight = world.getMinHeight();
108-
int maxHeight = world.getMaxHeight();
109-
String regionName = String.format("%s-%s-%s-%s", minX, maxX, minZ, maxZ);
110-
111-
ProtectedRegion existing = regions.getRegion(regionName);
112-
if (existing != null) {
113-
existing.getOwners().clear();
114-
existing.getOwners().addPlayer(UUID.fromString(o.get("owner_uuid").getAsString()));
115-
return;
116-
}
117-
Bukkit.broadcastMessage(messageToBroadcast);
118-
119-
120-
BlockVector3 min = BlockVector3.at(minX, minHeight, minZ);
121-
BlockVector3 max = BlockVector3.at(maxX, maxHeight, maxZ);
122-
123-
124-
System.out.println(regionName);
125-
ProtectedRegion region = new ProtectedCuboidRegion(regionName, min, max);
126-
region.setPriority(3);
127-
region.setFlag(Flags.GREET_TITLE, o.get("plot_name").getAsString());
128-
region.setFlag(Flags.GREET_MESSAGE, o.get("plot_info").getAsString());
129-
region.getOwners().addPlayer(UUID.fromString(o.get("owner_uuid").getAsString()));
130-
131-
regions.addRegion(region);
132-
} catch (Exception e) {
133-
WorldQLClient.getPluginInstance().getLogger().warning("Failed to process WorldGuard message " +
134-
"because dependencies are not installed.");
135-
}
136-
137-
}
13867
}
13968

14069
if (incoming.instruction() == Instruction.LocalMessage) {

src/main/resources/plugin.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: WorldQLClient
22
version: 1.0
33
api-version: 1.16
44
main: com.worldql.client.WorldQLClient
5-
softdepend:
6-
- WorldGuard
7-
- WorldEdit
85
commands:
96
refreshworld:
107
description: Pull and apply all block actions from database;

0 commit comments

Comments
 (0)