Skip to content

Commit

Permalink
refactor: use BlockPosition in ticker
Browse files Browse the repository at this point in the history
  • Loading branch information
StarWishsama committed Oct 14, 2024
1 parent 850953d commit b439401
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 11 deletions.
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,13 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.24.1</version>
<scope>provided</scope>
</dependency>

<!-- Shaded packages -->
<dependency>
<groupId>com.github.StarWishsama.dough</groupId>
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/city/norain/slimefun4/SlimefunExtended.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

import city.norain.slimefun4.compatibillty.VersionedEvent;
import city.norain.slimefun4.listener.SlimefunMigrateListener;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
import com.zaxxer.hikari.pool.HikariPool;
import io.github.bakedlibs.dough.versions.MinecraftVersion;
import io.github.bakedlibs.dough.versions.UnknownServerVersionException;
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
import java.util.logging.Level;
import javax.annotation.Nonnull;
import lombok.Getter;
import org.apache.logging.log4j.core.config.Configurator;

public final class SlimefunExtended {
private static SlimefunMigrateListener migrateListener = new SlimefunMigrateListener();
Expand All @@ -23,6 +27,10 @@ private static void checkDebug() {
databaseDebugMode = true;

Slimefun.getSQLProfiler().start();
} else {
Configurator.setLevel(HikariConfig.class.getName(), org.apache.logging.log4j.Level.OFF);
Configurator.setLevel(HikariDataSource.class.getName(), org.apache.logging.log4j.Level.OFF);
Configurator.setLevel(HikariPool.class.getName(), org.apache.logging.log4j.Level.OFF);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.xzavier0722.mc.plugin.slimefun4.storage.util.DataUtils;
import com.xzavier0722.mc.plugin.slimefun4.storage.util.InvStorageUtils;
import com.xzavier0722.mc.plugin.slimefun4.storage.util.LocationUtils;
import io.github.bakedlibs.dough.blocks.BlockPosition;
import io.github.bakedlibs.dough.collections.Pair;
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import io.github.thebusybiscuit.slimefun4.core.attributes.UniversalDataSupport;
Expand Down Expand Up @@ -250,7 +251,7 @@ public SlimefunUniversalData createUniversalData(Location l, String sfId) {
checkDestroy();

var uuid = UUID.randomUUID();
var uniData = new SlimefunUniversalData(uuid, l, sfId);
var uniData = new SlimefunUniversalData(uuid, new BlockPosition(l), sfId);

uniData.setIsDataLoaded(true);

Expand Down Expand Up @@ -459,7 +460,7 @@ public SlimefunBlockData getBlockDataFromCache(Location l) {
? null
: new SlimefunUniversalData(
uuid,
LocationUtils.toLocation(result.get(0).get(FieldKey.LAST_PRESENT)),
new BlockPosition(LocationUtils.toLocation(result.get(0).get(FieldKey.LAST_PRESENT))),
result.get(0).get(FieldKey.SLIMEFUN_ID));
}

Expand Down Expand Up @@ -655,7 +656,7 @@ public void loadUniversalData() {
var uuid = data.getUUID(FieldKey.UNIVERSAL_UUID);
var location = LocationUtils.toLocation(data.get(FieldKey.LAST_PRESENT));

var uniData = new SlimefunUniversalData(uuid, location, sfId);
var uniData = new SlimefunUniversalData(uuid, new BlockPosition(location), sfId);

scheduleReadTask(() -> loadUniversalData(uniData));
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.xzavier0722.mc.plugin.slimefun4.storage.controller;

import io.github.bakedlibs.dough.blocks.BlockPosition;
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
import java.util.UUID;
import javax.annotation.Nullable;
Expand All @@ -15,18 +16,18 @@
public class SlimefunUniversalData extends ASlimefunDataContainer {
private volatile UniversalMenu universalMenu;

@Nullable private volatile Location lastPresent;
@Nullable private volatile BlockPosition lastPresent;

private volatile boolean pendingRemove = false;

@ParametersAreNonnullByDefault
SlimefunUniversalData(UUID uuid, Location location, String sfId) {
SlimefunUniversalData(UUID uuid, BlockPosition location, String sfId) {
super(uuid.toString(), sfId);
this.lastPresent = location;
}

@ParametersAreNonnullByDefault
SlimefunUniversalData(UUID uuid, Location location, SlimefunUniversalData other) {
SlimefunUniversalData(UUID uuid, BlockPosition location, SlimefunUniversalData other) {
super(uuid.toString(), other, other.getSfId());
this.lastPresent = location;
}
Expand Down Expand Up @@ -66,6 +67,10 @@ public UUID getUUID() {
return UUID.fromString(getKey());
}

public Location getLastPresent() {
return this.lastPresent.toLocation();
}

@Override
public String toString() {
return "SlimefunUniversalData [sfId=" + getSfId() + ", isPendingRemove=" + pendingRemove + "]";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ public interface IMigrator {

MigrateStatus migrateData();

String getName();
default String getName() {
return this.getClass().getSimpleName();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ public SlimefunDatabaseManager(Slimefun plugin) {
public void init() {
initDefaultVal();

// Minimise hikari log
System.setProperty("org.slf4j.simpleLogger.log.com.zaxxer.hikari", "error");

try {
blockDataStorageType = StorageType.valueOf(blockStorageConfig.getString("storageType"));
var readExecutorThread = blockStorageConfig.getInt("readExecutorThread");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ protected void updateRecipe(@Nonnull Block b, @Nonnull Player p) {
menu.open(p);

SoundEffect.AUTO_CRAFTER_UPDATE_RECIPE.playAt(b);
;

if (!task.isEmpty()) {
task.start(menu.toInventory());
Expand Down

0 comments on commit b439401

Please sign in to comment.