Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-25 20:16:13 +01:00
Code Issues Projects Releases Wiki Activity

Optimizing block ownership

Browse Source
This commit is contained in:
Zrips 2021-07-15 13:11:35 +03:00
parent 509ac682ad
commit 4f87750bfa
6 changed files with 74 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/CMILib1.0.2.2.jar → libs/CMILib1.0.2.12.jar
View File

Binary file not shown.

31
src/main/java/com/gamingmesh/jobs/Jobs.java
View File

@ -142,7 +142,8 @@ public final class Jobs extends JavaPlugin {
private static PermissionHandler permissionHandler;
private static PermissionManager permissionManager;
private final Set<BlockOwnerShip> blockOwnerShips = new HashSet<>();
private final HashMap<CMIMaterial, BlockOwnerShip> blockOwnerShipsMaterial = new HashMap<>();
private final HashMap<BlockTypes, BlockOwnerShip> blockOwnerShipsBlockType = new HashMap<>();
private boolean kyoriSupported = false;
@ -193,16 +194,12 @@ public final class Jobs extends JavaPlugin {
* @return {@link BlockOwnerShip}, otherwise {@link Optional#empty()}
*/
public Optional<BlockOwnerShip> getBlockOwnerShip(CMIMaterial type, boolean addNew) {
BlockOwnerShip b = null;
for (BlockOwnerShip ship : blockOwnerShips) {
if (ship.getMaterial() == type) {
b = ship;
break;
}
}
BlockOwnerShip b = blockOwnerShipsMaterial.get(type);
if (addNew && b == null) {
blockOwnerShips.add(b = new BlockOwnerShip(type));
b = new BlockOwnerShip(type);
blockOwnerShipsMaterial.put(type, b);
blockOwnerShipsBlockType.put(b.getType(), b);
}
return Optional.ofNullable(b);
@ -215,17 +212,15 @@ public final class Jobs extends JavaPlugin {
* @return {@link BlockOwnerShip}, otherwise {@link Optional#empty()}
*/
public Optional<BlockOwnerShip> getBlockOwnerShip(BlockTypes type) {
for (BlockOwnerShip ship : blockOwnerShips) {
if (ship.getType() == type) {
return Optional.ofNullable(ship);
}
}
BlockOwnerShip b = blockOwnerShipsBlockType.get(type);
if (b != null)
return Optional.ofNullable(b);
return Optional.empty();
}
public void removeBlockOwnerShip(org.bukkit.block.Block block) {
for (BlockOwnerShip ship : blockOwnerShips) {
for (BlockOwnerShip ship : blockOwnerShipsMaterial.values()) {
ship.remove(block);
}
}
@ -233,8 +228,8 @@ public final class Jobs extends JavaPlugin {
/**
* @return a set of block owner ships.
*/
public Set<BlockOwnerShip> getBlockOwnerShips() {
return blockOwnerShips;
public HashMap<CMIMaterial, BlockOwnerShip> getBlockOwnerShips() {
return blockOwnerShipsMaterial;
}
private Placeholder placeholder;
@ -879,7 +874,7 @@ public final class Jobs extends JavaPlugin {
dao.saveExplore();
}
blockOwnerShips.forEach(BlockOwnerShip::save);
blockOwnerShipsMaterial.values().forEach(BlockOwnerShip::save);
ToggleBarHandling.save();
if (saveTask != null)

71
src/main/java/com/gamingmesh/jobs/container/blockOwnerShip/BlockOwnerShip.java
View File

@ -6,6 +6,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import org.bukkit.block.Block;
@ -19,6 +20,7 @@ import com.gamingmesh.jobs.config.YmlMaker;
import com.gamingmesh.jobs.container.JobsPlayer;
import com.gamingmesh.jobs.stuff.blockLoc;
import net.Zrips.CMILib.Container.CMILocation;
import net.Zrips.CMILib.Items.CMIMaterial;
public class BlockOwnerShip {
@ -27,7 +29,7 @@ public class BlockOwnerShip {
private BlockTypes type;
private String metadataName = "";
private final Map<UUID, List<blockLoc>> blockOwnerShips = new HashMap<>();
private final Map<UUID, HashMap<String, blockLoc>> blockOwnerShips = new HashMap<>();
private final Jobs plugin = org.bukkit.plugin.java.JavaPlugin.getPlugin(Jobs.class);
@ -71,7 +73,7 @@ public class BlockOwnerShip {
return metadataName;
}
public Map<UUID, List<blockLoc>> getBlockOwnerShips() {
public Map<UUID, HashMap<String, blockLoc>> getBlockOwnerShips() {
return blockOwnerShips;
}
@ -115,8 +117,14 @@ public class BlockOwnerShip {
return ownershipFeedback.newReg;
}
List<blockLoc> ls = blockOwnerShips.getOrDefault(jPlayer.getUniqueId(), new ArrayList<>());
ls.add(new blockLoc(block.getLocation()));
HashMap<String, blockLoc> ls = blockOwnerShips.getOrDefault(jPlayer.getUniqueId(), new HashMap<String, blockLoc>());
String locString = CMILocation.toString(block.getLocation(), ":", true, true);
if (ls.containsKey(locString))
return ownershipFeedback.old;
ls.put(locString, new blockLoc(block.getLocation()));
blockOwnerShips.put(jPlayer.getUniqueId(), ls);
return ownershipFeedback.newReg;
}
@ -136,26 +144,23 @@ public class BlockOwnerShip {
return false;
}
List<blockLoc> ls = blockOwnerShips.getOrDefault(uuid, new ArrayList<>());
org.bukkit.Location blockLoc = block.getLocation();
HashMap<String, blockLoc> ls = blockOwnerShips.getOrDefault(uuid, new HashMap<String, blockLoc>());
String blockLoc = CMILocation.toString(block.getLocation(), ":", true, true);
for (blockLoc one : ls) {
if (one.getLocation().equals(blockLoc)) {
block.removeMetadata(metadataName, plugin);
ls.remove(one);
return true;
}
com.gamingmesh.jobs.stuff.blockLoc removed = ls.remove(blockLoc);
if (removed != null) {
block.removeMetadata(metadataName, plugin);
}
return false;
return removed != null;
}
public int clear(UUID uuid) {
List<blockLoc> ls = blockOwnerShips.remove(uuid);
HashMap<String, blockLoc> ls = blockOwnerShips.remove(uuid);
if (ls == null)
return 0;
for (blockLoc one : ls) {
for (blockLoc one : ls.values()) {
one.getBlock().removeMetadata(metadataName, plugin);
}
@ -167,7 +172,7 @@ public class BlockOwnerShip {
}
public int getTotal(UUID uuid) {
List<blockLoc> list = blockOwnerShips.get(uuid);
HashMap<String, blockLoc> list = blockOwnerShips.get(uuid);
return list == null ? 0 : list.size();
}
@ -212,17 +217,19 @@ public class BlockOwnerShip {
continue;
}
List<blockLoc> blist = new ArrayList<>();
HashMap<String, blockLoc> blist = new HashMap<String, blockLoc>();
for (String oneL : ls) {
blockLoc bl = new blockLoc(oneL);
Block block = bl.getBlock();
if (block == null)
continue;
CMILocation cmil = CMILocation.fromString(oneL, ":");
// Do we seriously need to re apply this to all blocks?
// Block block = bl.getBlock();
// if (block == null)
// continue;
//
// block.removeMetadata(metadataName, plugin);
// block.setMetadata(metadataName, new FixedMetadataValue(plugin, one));
block.removeMetadata(metadataName, plugin);
block.setMetadata(metadataName, new FixedMetadataValue(plugin, one));
blist.add(bl);
blist.put(CMILocation.toString(cmil, ":", true, true), bl);
total++;
}
@ -261,18 +268,18 @@ public class BlockOwnerShip {
: type == BlockTypes.BREWING_STAND ? "Brewing" : type == BlockTypes.SMOKER ? "Smoker" : "");
f.getConfig().set(path, null);
for (Map.Entry<UUID, List<blockLoc>> one : blockOwnerShips.entrySet()) {
String full = "";
for (Entry<UUID, HashMap<String, blockLoc>> one : blockOwnerShips.entrySet()) {
StringBuilder full = new StringBuilder();
for (blockLoc oneL : one.getValue()) {
if (!full.isEmpty())
full += ";";
for (String oneL : one.getValue().keySet()) {
if (!full.toString().isEmpty())
full.append(";");
full += oneL.toString();
full.append(oneL);
}
if (!full.isEmpty())
f.getConfig().set(path + "." + one.getKey().toString(), full);
if (!full.toString().isEmpty())
f.getConfig().set(path + "." + one.getKey().toString(), full.toString());
}
f.saveConfig();

29
src/main/java/com/gamingmesh/jobs/container/blockOwnerShip/BlockTypes.java
View File

@ -1,16 +1,31 @@
package com.gamingmesh.jobs.container.blockOwnerShip;
import java.util.HashMap;
import net.Zrips.CMILib.Items.CMIMaterial;
public enum BlockTypes {
BREWING_STAND("BREWING_STAND", "LEGACY_BREWING_STAND"),
FURNACE("FURNACE", "LEGACY_BURNING_FURNACE"),
BREWING_STAND("BREWING_STAND", "LEGACY_BREWING_STAND"),
FURNACE("FURNACE", "LEGACY_BURNING_FURNACE"),
SMOKER,
BLAST_FURNACE;
private String[] names;
private static HashMap<CMIMaterial, BlockTypes> cache = new HashMap<>();
static {
for (CMIMaterial one : CMIMaterial.values()) {
for (BlockTypes b : values()) {
for (String name : b.names) {
if (name.equals(one.toString())) {
cache.put(one, b);
}
}
}
}
}
BlockTypes() {
names = new String[] { toString() };
}
@ -24,14 +39,6 @@ public enum BlockTypes {
}
public static BlockTypes getFromCMIMaterial(CMIMaterial type) {
for (BlockTypes b : values()) {
for (String name : b.names) {
if (name.equals(type.name())) {
return b;
}
}
}
return null;
return cache.get(type);
}
}

2
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -1097,7 +1097,7 @@ public final class JobsPaymentListener implements Listener {
public void onEntityDamageByPlayer(EntityDamageEvent event) {
if (!Jobs.getGCManager().MonsterDamageUse || !(event instanceof EntityDamageByEntityEvent)
|| !Jobs.getGCManager().canPerformActionInWorld(event.getEntity().getWorld()))
return;
return;
Entity ent = event.getEntity();
if (ent instanceof Player || !(ent instanceof Damageable))

4
src/main/resources/restrictedBlocks.yml
View File

@ -70,4 +70,6 @@ blocksTimer:
NETHER_WART: 60
PUMPKIN: 30
CARVED_PUMPKIN: 30
MELON: 30
MELON: 30
DIAMOND_ORE: -1
DEEPSLATE_DIAMOND_ORE: -1