Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.7-SNAPSHOT'
id 'fabric-loom' version '1.13-SNAPSHOT'
id 'maven-publish'
}

Expand Down Expand Up @@ -50,6 +50,10 @@ dependencies {

// check for latest versions at https://jitpack.io/#dev.tildejustin/state-output
modCompileOnly "dev.tildejustin.state-output:state-output-common:v1.2.0"

modCompileOnly ("com.github.DuncanRuns.Hermes:1.16.1:9ab2d9cc4e") {
transitive = false
}
}

processResources {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.parallel=true
# check these on https://fabricmc.net/develop
minecraft_version=1.16.1
yarn_mappings=1.16.1-build.24
loader_version=0.16.10
loader_version=0.18.2

# Mod Properties
mod_version=1.6
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
jdk:
- openjdk17
- openjdk21
before_install:
- sdk install java 17.0.1-open
- sdk use java 17.0.1-open
- sdk install java 21.0.2-open
- sdk use java 21.0.2-open
3 changes: 3 additions & 0 deletions src/main/java/me/contaria/seedqueue/SeedQueueEntry.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public SeedQueueEntry(MinecraftServer server, LevelStorage.Session session, Mine
this.userCache = userCache;

((SQMinecraftServer) server).seedQueue$setEntry(this);
ModCompat.hermes$writeToWorldLog(getServer(), "seedqueue_create", System.currentTimeMillis());
}

public MinecraftServer getServer() {
Expand Down Expand Up @@ -318,6 +319,7 @@ public void setMaxWorldGenerationReached() {
public boolean lock() {
if (!this.locked) {
this.locked = true;
ModCompat.hermes$writeToWorldLog(this.server, "seedqueue_lock", System.currentTimeMillis());
SeedQueue.ping();
return true;
}
Expand Down Expand Up @@ -369,6 +371,7 @@ public synchronized void discard() {
}

SeedQueue.LOGGER.info("Discarding \"{}\"...", this.session.getDirectoryName());
ModCompat.hermes$writeToWorldLog(this.server, "seedqueue_discard", System.currentTimeMillis());

this.discarded = true;

Expand Down
10 changes: 10 additions & 0 deletions src/main/java/me/contaria/seedqueue/compat/HermesCompat.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package me.contaria.seedqueue.compat;

import me.duncanruns.hermes.api.HermesModAPI;
import net.minecraft.server.MinecraftServer;

public class HermesCompat {
public static void writeToWorldLog(MinecraftServer server, String type, long time) {
HermesModAPI.writeToWorldLog(HermesModAPI.getSavePath(server), type, time);
}
}
7 changes: 7 additions & 0 deletions src/main/java/me/contaria/seedqueue/compat/ModCompat.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public class ModCompat {
public static final boolean HAS_STANDARDSETTINGS = FabricLoader.getInstance().isModLoaded("standardsettings");
public static final boolean HAS_WORLDPREVIEW = FabricLoader.getInstance().isModLoaded("worldpreview");
public static final boolean HAS_STATEOUTPUT = FabricLoader.getInstance().isModLoaded("state-output");
public static final boolean HAS_HERMES = FabricLoader.getInstance().isModLoaded("hermes");

public static void fastReset$fastReset(MinecraftServer server) {
if (HAS_FASTRESET) {
Expand Down Expand Up @@ -86,4 +87,10 @@ public class ModCompat {
SeedQueuePreviewFrameBuffer.clearFramebufferPool();
}
}

public static void hermes$writeToWorldLog(MinecraftServer server, String type, long time) {
if (HAS_HERMES) {
HermesCompat.writeToWorldLog(server, type, time);
}
}
}

This file was deleted.

1 change: 0 additions & 1 deletion src/main/resources/seedqueue.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"client.debug.DebugHudMixin",
"client.levellist.LevelStorageMixin",
"client.profiling.WorldRendererMixin",
"client.render.LevelLoadingScreenMixin",
"client.render.MinecraftClientMixin",
"client.sounds.SoundManagerMixin",
"client.sounds.SoundSystemMixin",
Expand Down