Port to 1.20.3/.4

- Ported mod
- Removed TickTime as it was removed from the game
This commit is contained in:
J-onasJones 2023-12-13 03:32:37 +01:00
parent 07431cc22b
commit 3bacb4b181
3 changed files with 11 additions and 11 deletions

View file

@ -2,14 +2,14 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
minecraft_version=1.20.2 minecraft_version=1.20.4
yarn_mappings=1.20.2+build.1 yarn_mappings=1.20.4+build.2
loader_version=0.14.22 loader_version=0.15.1
# Mod Properties # Mod Properties
mod_version = 0.3.1 mod_version = 0.3.2
maven_group = me.jonasjones maven_group = me.jonasjones
archives_base_name = mcwebserver-fabric-quilt archives_base_name = mcwebserver-fabric-quilt
# Dependencies # Dependencies
fabric_version=0.89.0+1.20.2 fabric_version=0.91.2+1.20.4

View file

@ -46,9 +46,9 @@ public class ApiHandler {
case "ticks" -> { case "ticks" -> {
return ApiRequests.singleValueRequest(String.valueOf(ApiRequestsUtil.getTICKS())); return ApiRequests.singleValueRequest(String.valueOf(ApiRequestsUtil.getTICKS()));
} }
case "ticktime" -> { /*case "ticktime" -> {
return ApiRequests.singleValueRequest(String.valueOf(ApiRequestsUtil.getTICK_TIME())); return ApiRequests.singleValueRequest(String.valueOf(ApiRequestsUtil.getTICK_TIME()));
} }*/
case "timereference" -> { case "timereference" -> {
return ApiRequests.singleValueRequest(String.valueOf(ApiRequestsUtil.getTIME_REFERENCE())); return ApiRequests.singleValueRequest(String.valueOf(ApiRequestsUtil.getTIME_REFERENCE()));
} }
@ -74,7 +74,7 @@ public class ApiHandler {
ApiRequestsUtil.setMAX_PLAYER_COUNT(server.getMaxPlayerCount()); ApiRequestsUtil.setMAX_PLAYER_COUNT(server.getMaxPlayerCount());
ApiRequestsUtil.setSERVER_METADATA(server.getServerMetadata()); ApiRequestsUtil.setSERVER_METADATA(server.getServerMetadata());
ApiRequestsUtil.setTICKS(server.getTicks()); ApiRequestsUtil.setTICKS(server.getTicks());
ApiRequestsUtil.setTICK_TIME(server.getTickTime()); //ApiRequestsUtil.setTICK_TIME(server.getTickTime());
ApiRequestsUtil.setTIME_REFERENCE(server.getTimeReference()); ApiRequestsUtil.setTIME_REFERENCE(server.getTimeReference());
} }
}); });

View file

@ -47,8 +47,8 @@ public class ApiRequestsUtil {
private static ServerMetadata SERVER_METADATA; private static ServerMetadata SERVER_METADATA;
@Getter @Setter @Getter @Setter
private static int TICKS; private static int TICKS;
@Getter @Setter //@Getter @Setter
private static float TICK_TIME; //private static float TICK_TIME;
@Getter @Setter @Getter @Setter
private static long TIME_REFERENCE; private static long TIME_REFERENCE;
@Getter @Setter @Getter @Setter
@ -108,7 +108,7 @@ public class ApiRequestsUtil {
apiServerInfo.setLOADER_VERSION(LOADER_VERSION); apiServerInfo.setLOADER_VERSION(LOADER_VERSION);
apiServerInfo.setMETADATA(serverMetadata()); apiServerInfo.setMETADATA(serverMetadata());
apiServerInfo.setTICKS(ApiRequestsUtil.getTICKS()); apiServerInfo.setTICKS(ApiRequestsUtil.getTICKS());
apiServerInfo.setTICK_TIME(ApiRequestsUtil.getTICK_TIME()); //apiServerInfo.setTICK_TIME(ApiRequestsUtil.getTICK_TIME());
apiServerInfo.setTIME_REFERENCE(ApiRequestsUtil.getTIME_REFERENCE()); apiServerInfo.setTIME_REFERENCE(ApiRequestsUtil.getTIME_REFERENCE());
return gson.toJsonTree(apiServerInfo).getAsJsonObject(); return gson.toJsonTree(apiServerInfo).getAsJsonObject();