Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix merge and build #5

Merged
merged 12 commits into from
Jul 28, 2024
Merged

Fix merge and build #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6c2f22f
Contacts rewrite (#667)
TylerS1066 Jul 14, 2024
d5627a9
Update all signs (#670)
TylerS1066 Jul 21, 2024
a7aa511
[Feature] Typesafe datatags (#669)
DerToaster98 Jul 25, 2024
2095246
Contacts data tag (#672)
TylerS1066 Jul 25, 2024
09f23f9
Update version
TylerS1066 Jul 27, 2024
e04b661
Craft status rewrite (#674)
TylerS1066 Jul 27, 2024
42881f2
[Feature] Proper access to craft via UUID (#673)
DerToaster98 Jul 28, 2024
1c519c3
Merge branch 'main' into pr/616
TylerS1066 Jul 28, 2024
05dc0f8
Fix merge
TylerS1066 Jul 28, 2024
0ee6138
Fix build
TylerS1066 Jul 28, 2024
964c3b7
Process tracked locations on all parent crafts
TylerS1066 Jul 28, 2024
84b4dd6
Update RotationTask.java
TylerS1066 Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@
import net.countercraft.movecraft.config.Settings;
import net.countercraft.movecraft.craft.ChunkManager;
import net.countercraft.movecraft.craft.CraftManager;
import net.countercraft.movecraft.listener.BlockListener;
import net.countercraft.movecraft.listener.InteractListener;
import net.countercraft.movecraft.listener.PlayerListener;
import net.countercraft.movecraft.features.contacts.ContactsCommand;
import net.countercraft.movecraft.features.contacts.ContactsManager;
import net.countercraft.movecraft.features.contacts.ContactsSign;
import net.countercraft.movecraft.features.status.StatusManager;
import net.countercraft.movecraft.features.status.StatusSign;
import net.countercraft.movecraft.listener.*;
import net.countercraft.movecraft.localisation.I18nSupport;
import net.countercraft.movecraft.mapUpdater.MapUpdateManager;
import net.countercraft.movecraft.processing.WorldManager;
Expand Down Expand Up @@ -195,7 +198,6 @@ public void onEnable() {
getCommand("cruise").setExecutor(new CruiseCommand());
getCommand("craftreport").setExecutor(new CraftReportCommand());
getCommand("manoverboard").setExecutor(new ManOverboardCommand());
getCommand("contacts").setExecutor(new ContactsCommand());
getCommand("scuttle").setExecutor(new ScuttleCommand());
getCommand("crafttype").setExecutor(new CraftTypeCommand());
getCommand("craftinfo").setExecutor(new CraftInfoCommand());
Expand All @@ -204,7 +206,6 @@ public void onEnable() {
getServer().getPluginManager().registerEvents(new PlayerListener(), this);
getServer().getPluginManager().registerEvents(new ChunkManager(), this);
getServer().getPluginManager().registerEvents(new AscendSign(), this);
getServer().getPluginManager().registerEvents(new ContactsSign(), this);
getServer().getPluginManager().registerEvents(new CraftSign(), this);
getServer().getPluginManager().registerEvents(new CruiseSign(), this);
getServer().getPluginManager().registerEvents(new DescendSign(), this);
Expand All @@ -216,10 +217,22 @@ public void onEnable() {
getServer().getPluginManager().registerEvents(new ReleaseSign(), this);
getServer().getPluginManager().registerEvents(new RemoteSign(), this);
getServer().getPluginManager().registerEvents(new SpeedSign(), this);
getServer().getPluginManager().registerEvents(new StatusSign(), this);
getServer().getPluginManager().registerEvents(new SubcraftRotateSign(), this);
getServer().getPluginManager().registerEvents(new TeleportSign(), this);
getServer().getPluginManager().registerEvents(new ScuttleSign(), this);
getServer().getPluginManager().registerEvents(new CraftPilotListener(), this);
getServer().getPluginManager().registerEvents(new CraftReleaseListener(), this);

var contactsManager = new ContactsManager();
contactsManager.runTaskTimerAsynchronously(this, 0, 20);
getServer().getPluginManager().registerEvents(contactsManager, this);
getServer().getPluginManager().registerEvents(new ContactsSign(), this);
getCommand("contacts").setExecutor(new ContactsCommand());

var statusManager = new StatusManager();
statusManager.runTaskTimerAsynchronously(this, 0, 1);
getServer().getPluginManager().registerEvents(statusManager, this);
getServer().getPluginManager().registerEvents(new StatusSign(), this);

logger.info("[V " + getDescription().getVersion() + "] has been enabled.");
}
Expand All @@ -230,7 +243,6 @@ public void onLoad() {
instance = this;
logger = getLogger();
saveDefaultConfig();

}

private boolean initializeDatapack() {
Expand Down Expand Up @@ -314,5 +326,7 @@ public SmoothTeleport getSmoothTeleport() {
return smoothTeleport;
}

public AsyncManager getAsyncManager(){return asyncManager;}
public AsyncManager getAsyncManager() {
return asyncManager;
}
}
253 changes: 2 additions & 251 deletions Movecraft/src/main/java/net/countercraft/movecraft/async/AsyncManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,51 +24,29 @@
import net.countercraft.movecraft.async.rotation.RotationTask;
import net.countercraft.movecraft.async.translation.TranslationTask;
import net.countercraft.movecraft.config.Settings;
import net.countercraft.movecraft.craft.Craft;
import net.countercraft.movecraft.craft.CraftManager;
import net.countercraft.movecraft.craft.CraftStatus;
import net.countercraft.movecraft.craft.PilotedCraft;
import net.countercraft.movecraft.craft.PlayerCraft;
import net.countercraft.movecraft.craft.SinkingCraft;
import net.countercraft.movecraft.craft.*;
import net.countercraft.movecraft.craft.type.CraftType;
import net.countercraft.movecraft.craft.type.RequiredBlockEntry;
import net.countercraft.movecraft.events.CraftReleaseEvent;
import net.countercraft.movecraft.exception.EmptyHitBoxException;
import net.countercraft.movecraft.localisation.I18nSupport;
import net.countercraft.movecraft.mapUpdater.MapUpdateManager;
import net.countercraft.movecraft.mapUpdater.update.BlockCreateCommand;
import net.countercraft.movecraft.mapUpdater.update.UpdateCommand;
import net.countercraft.movecraft.util.Counter;
import net.countercraft.movecraft.util.Tags;
import net.countercraft.movecraft.util.hitboxes.HitBox;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.sound.Sound;
import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.NotNull;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.*;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;

@Deprecated
public class AsyncManager extends BukkitRunnable {
private final Map<AsyncTask, Craft> ownershipMap = new HashMap<>();
private final Map<Craft, Map<Craft, Long>> recentContactTracking = new WeakHashMap<>();
private final BlockingQueue<AsyncTask> finishedAlgorithms = new LinkedBlockingQueue<>();
private final Set<Craft> clearanceSet = new HashSet<>();
private final Map<HitBox, Long> wrecks = new HashMap<>();
Expand All @@ -78,7 +56,6 @@ public class AsyncManager extends BukkitRunnable {
private final Map<Craft, Integer> cooldownCache = new WeakHashMap<>();

private long lastFadeCheck = 0;
private long lastContactCheck = 0;

public AsyncManager() {}

Expand Down Expand Up @@ -321,40 +298,6 @@ else if (dive) {
}
}

private void detectSinking(){
for(Craft craft : CraftManager.getInstance()) {
if (craft instanceof SinkingCraft)
continue;
if (craft.getType().getDoubleProperty(CraftType.SINK_PERCENT) == 0.0 || !craft.isNotProcessing())
continue;
long ticksElapsed = (System.currentTimeMillis() - craft.getLastBlockCheck()) / 50;

if (ticksElapsed <= Settings.SinkCheckTicks)
continue;

CraftStatus status = checkCraftStatus(craft);
//If the craft is disabled, play a sound and disable it.
//Only do this if the craft isn't already disabled.
if (status.isDisabled() && craft.isNotProcessing() && !craft.getDisabled()) {
craft.setDisabled(true);
craft.getAudience().playSound(Sound.sound(Key.key("entity.iron_golem.death"), Sound.Source.NEUTRAL, 5.0f, 5.0f));
}


// if the craft is sinking, let the player
// know and release the craft. Otherwise
// update the time for the next check
if (status.isSinking() && craft.isNotProcessing()) {
craft.getAudience().sendMessage(I18nSupport.getInternationalisedComponent("Player - Craft is sinking"));
craft.setCruising(false);
CraftManager.getInstance().sink(craft);
}
else {
craft.setLastBlockCheck(System.currentTimeMillis());
}
}
}

//Controls sinking crafts
private void processSinking() {
//copy the crafts before iteration to prevent concurrent modifications
Expand Down Expand Up @@ -438,113 +381,12 @@ private void processFadingBlocks() {
lastFadeCheck = System.currentTimeMillis();
}

private void processDetection() {
long ticksElapsed = (System.currentTimeMillis() - lastContactCheck) / 50;
if (ticksElapsed < 20)
return;
lastContactCheck = System.currentTimeMillis();

for (World w : Bukkit.getWorlds()) {
if (w == null)
continue;

for (Craft craft : CraftManager.getInstance().getPlayerCraftsInWorld(w)) {
MovecraftLocation craftCenter;
try {
craftCenter = craft.getHitBox().getMidPoint();
}
catch (EmptyHitBoxException e) {
continue;
}
if (!recentContactTracking.containsKey(craft))
recentContactTracking.put(craft, new WeakHashMap<>());
for (Craft target : craft.getContacts()) {
MovecraftLocation targetCenter;
try {
targetCenter = target.getHitBox().getMidPoint();
}
catch (EmptyHitBoxException e) {
continue;
}
int diffx = craftCenter.getX() - targetCenter.getX();
int diffz = craftCenter.getZ() - targetCenter.getZ();
int distsquared = craftCenter.distanceSquared(targetCenter);
// craft has been detected

// has the craft not been seen in the last
// minute, or is completely new?
if (System.currentTimeMillis()
- recentContactTracking.get(craft).getOrDefault(target, 0L) <= 60000)
continue;


Component notification = I18nSupport.getInternationalisedComponent(
"Contact - New Contact").append(Component.text( ": "));

if (target.getName().length() >= 1)
notification = notification.append(Component.text(target.getName() + " ("));
notification = notification.append(Component.text(
target.getType().getStringProperty(CraftType.NAME)));
if (target.getName().length() >= 1)
notification = notification.append(Component.text(")"));
notification = notification.append(Component.text(" "))
.append(I18nSupport.getInternationalisedComponent("Contact - Commanded By"))
.append(Component.text(" "));
if (target instanceof PilotedCraft)
notification = notification.append(Component.text(
((PilotedCraft) target).getPilot().getDisplayName()));
else
notification = notification.append(Component.text("NULL"));
notification = notification.append(Component.text(", "))
.append(I18nSupport.getInternationalisedComponent("Contact - Size"))
.append(Component.text( ": "))
.append(Component.text(target.getOrigBlockCount()))
.append(Component.text(", "))
.append(I18nSupport.getInternationalisedComponent("Contact - Range"))
.append(Component.text(": "))
.append(Component.text((int) Math.sqrt(distsquared)))
.append(Component.text(" "))
.append(I18nSupport.getInternationalisedComponent("Contact - To The"))
.append(Component.text(" "));
if (Math.abs(diffx) > Math.abs(diffz)) {
if (diffx < 0)
notification = notification.append(I18nSupport.getInternationalisedComponent(
"Contact/Subcraft Rotate - East"));
else
notification = notification.append(I18nSupport.getInternationalisedComponent(
"Contact/Subcraft Rotate - West"));
}
else if (diffz < 0)
notification = notification.append(I18nSupport.getInternationalisedComponent(
"Contact/Subcraft Rotate - South"));
else
notification = notification.append(I18nSupport.getInternationalisedComponent(
"Contact/Subcraft Rotate - North"));

notification = notification.append(Component.text("."));

craft.getAudience().sendMessage(notification);
var object = craft.getType().getObjectProperty(CraftType.COLLISION_SOUND);
if (!(object instanceof Sound))
throw new IllegalStateException("COLLISION_SOUND must be of type Sound");

craft.getAudience().playSound((Sound) object);

long timestamp = System.currentTimeMillis();
recentContactTracking.get(craft).put(target, timestamp);
}
}
}
}

public void run() {
clearAll();

processCruise();
detectSinking();
processSinking();
processFadingBlocks();
processDetection();
processAlgorithmQueue();

// now cleanup craft that are bugged and have not moved in the past 60 seconds,
Expand Down Expand Up @@ -574,95 +416,4 @@ private void clearAll() {

clearanceSet.clear();
}

public CraftStatus checkCraftStatus(@NotNull Craft craft) {
boolean isSinking = false;
boolean isDisabled = false;

// Create counters and populate with required block entries
Counter<RequiredBlockEntry> flyBlocks = new Counter<>();
flyBlocks.putAll(craft.getType().getRequiredBlockProperty(CraftType.FLY_BLOCKS));
Counter<RequiredBlockEntry> moveBlocks = new Counter<>();
moveBlocks.putAll(craft.getType().getRequiredBlockProperty(CraftType.MOVE_BLOCKS));

Counter<Material> materials = new Counter<>();
var v = craft.getType().getObjectProperty(CraftType.FUEL_TYPES);
if(!(v instanceof Map<?, ?>))
throw new IllegalStateException("FUEL_TYPES must be of type Map");
var fuelTypes = (Map<?, ?>) v;
for(var e : fuelTypes.entrySet()) {
if(!(e.getKey() instanceof Material))
throw new IllegalStateException("Keys in FUEL_TYPES must be of type Material");
if(!(e.getValue() instanceof Double))
throw new IllegalStateException("Values in FUEL_TYPES must be of type Double");
}

// go through each block in the HitBox, and if it's in the FlyBlocks or MoveBlocks, increment the counter
int totalNonNegligibleBlocks = 0;
int totalNonNegligibleWaterBlocks = 0;
double fuel = 0;
for (MovecraftLocation l : craft.getHitBox()) {
Material type = craft.getWorld().getBlockAt(l.getX(), l.getY(), l.getZ()).getType();
for(RequiredBlockEntry entry : flyBlocks.getKeySet()) {
if(entry.contains(type))
flyBlocks.add(entry);
}
for(RequiredBlockEntry entry : moveBlocks.getKeySet()) {
if(entry.contains(type))
moveBlocks.add(entry);
}
materials.add(type);

if (type != Material.FIRE && !type.isAir()) {
totalNonNegligibleBlocks++;
}
if (type != Material.FIRE && !type.isAir() && !Tags.FLUID.contains(type)) {
totalNonNegligibleWaterBlocks++;
}

if(Tags.FURNACES.contains(type)) {
InventoryHolder inventoryHolder = (InventoryHolder) craft.getWorld().getBlockAt(l.getX(), l.getY(), l.getZ()).getState();
for (ItemStack iStack : inventoryHolder.getInventory()) {
if (iStack == null || !fuelTypes.containsKey(iStack.getType()))
continue;
fuel += iStack.getAmount() * (double) fuelTypes.get(iStack.getType());
}
}
}

// now see if any of the resulting percentages
// are below the threshold specified in sinkPercent
double sinkPercent = craft.getType().getDoubleProperty(CraftType.SINK_PERCENT) / 100.0;
for(RequiredBlockEntry entry : flyBlocks.getKeySet()) {
if(!entry.check(flyBlocks.get(entry), totalNonNegligibleBlocks, sinkPercent))
isSinking = true;
}
for(RequiredBlockEntry entry : moveBlocks.getKeySet()) {
if(!entry.check(moveBlocks.get(entry), totalNonNegligibleBlocks, sinkPercent))
isDisabled = !craft.getDisabled() && craft.isNotProcessing();
}

// And check the OverallSinkPercent
if (craft.getType().getDoubleProperty(CraftType.OVERALL_SINK_PERCENT) != 0.0) {
double percent;
if (craft.getType().getBoolProperty(CraftType.BLOCKED_BY_WATER)) {
percent = (double) totalNonNegligibleBlocks
/ (double) craft.getOrigBlockCount();
}
else {
percent = (double) totalNonNegligibleWaterBlocks
/ (double) craft.getOrigBlockCount();
}
if (percent * 100.0 < craft.getType().getDoubleProperty(CraftType.OVERALL_SINK_PERCENT))
isSinking = true;
}

if (totalNonNegligibleBlocks == 0)
isSinking = true;

craft.updateMaterials(materials);
craft.setTotalFuel(fuel);

return CraftStatus.of(isSinking, isDisabled);
}
}
Loading