JfMods/DynRes
JfMods
/
DynRes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: update to 1.20.2
ci/woodpecker/push/jfmod Pipeline failed Details

This commit is contained in:
Johannes Frohnmeyer 2023-09-22 20:59:35 +02:00
parent 2fc3da9b78
commit 7af7faa24d
Signed by: Johannes
GPG Key ID: E76429612C2929F4
5 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.gradle.kts
View File

@ -5,12 +5,12 @@ plugins {
allprojects { group = "io.gitlab.jfronny" } allprojects { group = "io.gitlab.jfronny" }
base.archivesName = "dynres" base.archivesName = "dynres"
val fabricVersion = "0.83.0+1.20" val fabricVersion = "0.89.1+1.20.2"
jfMod { jfMod {
minecraftVersion = "1.20.1" minecraftVersion = "1.20.2"
yarn("build.9") yarn("build.1")
loaderVersion = "0.14.21" loaderVersion = "0.14.22"
libJfVersion = "3.10.2" libJfVersion = "3.13.1"
modrinth { modrinth {
projectId = "dynres" projectId = "dynres"
@ -26,9 +26,9 @@ jfMod {
} }
dependencies { dependencies {
modImplementation("io.gitlab.jfronny.libjf:libjf-web-v0:${jfMod.libJfVersion.get()}") modImplementation("io.gitlab.jfronny.libjf:libjf-web-v1:${jfMod.libJfVersion.get()}")
modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${jfMod.libJfVersion.get()}") modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}")
// Dev env // Dev env
modLocalRuntime("com.terraformersmc:modmenu:7.1.0") modLocalRuntime("com.terraformersmc:modmenu:8.0.0-beta.2")
} }

17
src/client/java/io/gitlab/jfronny/dynres/mixin/ClientPlayNetworkHandlerMixin.java
View File

@ -1,15 +1,16 @@
package io.gitlab.jfronny.dynres.mixin; package io.gitlab.jfronny.dynres.mixin;
import io.gitlab.jfronny.dynres.*; import io.gitlab.jfronny.dynres.DynRes;
import net.minecraft.client.network.*; import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.packet.c2s.play.*; import net.minecraft.network.packet.c2s.common.ResourcePackStatusC2SPacket;
import net.minecraft.network.packet.s2c.play.*; import net.minecraft.network.packet.s2c.common.ResourcePackSendS2CPacket;
import org.jetbrains.annotations.*; import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.*; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.net.*; import java.net.URL;
@Mixin(ClientPlayNetworkHandler.class) @Mixin(ClientPlayNetworkHandler.class)
public abstract class ClientPlayNetworkHandlerMixin { public abstract class ClientPlayNetworkHandlerMixin {

4
src/main/java/io/gitlab/jfronny/dynres/Cfg.java
View File

@ -1,7 +1,7 @@
package io.gitlab.jfronny.dynres; package io.gitlab.jfronny.dynres;
import io.gitlab.jfronny.libjf.config.api.v1.Entry; import io.gitlab.jfronny.libjf.config.api.v2.Entry;
import io.gitlab.jfronny.libjf.config.api.v1.JfConfig; import io.gitlab.jfronny.libjf.config.api.v2.JfConfig;
@JfConfig(referencedConfigs = "libjf-web-v0") @JfConfig(referencedConfigs = "libjf-web-v0")
public class Cfg { public class Cfg {

7
src/main/java/io/gitlab/jfronny/dynres/DynRes.java
View File

@ -1,7 +1,6 @@
package io.gitlab.jfronny.dynres; package io.gitlab.jfronny.dynres;
import io.gitlab.jfronny.libjf.web.api.WebInit; import io.gitlab.jfronny.libjf.web.api.v1.*;
import io.gitlab.jfronny.libjf.web.api.WebServer;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -11,7 +10,7 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
public class DynRes implements WebInit { public class DynRes implements WebEntrypoint {
public static final Logger LOGGER = LoggerFactory.getLogger("DynRes"); public static final Logger LOGGER = LoggerFactory.getLogger("DynRes");
public static Path packFile; public static Path packFile;
public static String packUrl = ""; public static String packUrl = "";
@ -30,7 +29,7 @@ public class DynRes implements WebInit {
public void register(WebServer api) { public void register(WebServer api) {
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER && packFile != null) { if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER && packFile != null) {
try { try {
packUrl = api.registerFile("/resources.zip", packFile, !Cfg.hashResources); packUrl = api.registerFile(PathSegment.of("resources.zip"), packFile, !Cfg.hashResources);
LOGGER.info("Initialized DynRes at " + packUrl); LOGGER.info("Initialized DynRes at " + packUrl);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();

32
src/main/java/io/gitlab/jfronny/dynres/mixin/ServerPropertiesHandlerMixin.java
View File

@ -1,20 +1,24 @@
package io.gitlab.jfronny.dynres.mixin; package io.gitlab.jfronny.dynres.mixin;
import io.gitlab.jfronny.dynres.*; import io.gitlab.jfronny.dynres.Cfg;
import io.gitlab.jfronny.libjf.web.api.*; import io.gitlab.jfronny.dynres.DynRes;
import io.gitlab.jfronny.libjf.web.impl.util.*; import io.gitlab.jfronny.libjf.web.api.v1.WebServer;
import net.minecraft.server.*; import io.gitlab.jfronny.libjf.web.impl.util.WebPaths;
import net.minecraft.server.dedicated.*; import net.minecraft.server.MinecraftServer;
import net.minecraft.text.*; import net.minecraft.server.dedicated.ServerPropertiesHandler;
import org.jetbrains.annotations.*; import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.*; import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.callback.*; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.io.*; import java.io.IOException;
import java.nio.file.*; import java.nio.file.Files;
import java.security.*; import java.security.MessageDigest;
import java.util.*; import java.security.NoSuchAlgorithmException;
import java.util.Optional;
@Mixin(ServerPropertiesHandler.class) @Mixin(ServerPropertiesHandler.class)
public abstract class ServerPropertiesHandlerMixin { public abstract class ServerPropertiesHandlerMixin {