Skip to content

Commit cecf23d

Browse files
committed
1.19 port
1 parent dd7c01f commit cecf23d

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '0.10-SNAPSHOT'
2+
id 'fabric-loom' version '0.12-SNAPSHOT'
33
id 'maven-publish'
44
}
55

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/versions.html
6-
minecraft_version=1.18.2
7-
yarn_mappings=1.18.2+build.3
8-
loader_version=0.14.4
9-
polymer_version=0.2.0-beta.40+1.18.2
10-
fabric_version=0.51.1+1.18.2
6+
minecraft_version=1.19.2
7+
yarn_mappings=1.19.2+build.3
8+
loader_version=0.14.9
9+
polymer_version=0.2.12+1.19.2
10+
fabric_version=0.59.0+1.19.2
1111

1212
# Mod Properties
13-
mod_version = 0.2.0
13+
mod_version = 0.2.1
1414
maven_group = com.github.aws404
1515
archives_base_name = polypack-host

src/main/java/com/github/aws404/polypackhost/PolypackHttpHandler.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import eu.pb4.polymer.api.resourcepack.PolymerRPUtils;
88
import net.fabricmc.loader.api.FabricLoader;
99
import net.minecraft.server.MinecraftServer;
10+
import net.minecraft.server.dedicated.MinecraftDedicatedServer;
11+
import net.minecraft.text.Text;
1012

1113
import java.io.*;
1214
import java.math.BigInteger;
@@ -15,6 +17,7 @@
1517
import java.nio.file.Path;
1618
import java.security.MessageDigest;
1719
import java.util.Objects;
20+
import java.util.Optional;
1821
import java.util.Random;
1922
import java.util.concurrent.CompletableFuture;
2023
import java.util.concurrent.ExecutorService;
@@ -64,7 +67,15 @@ public static void start(MinecraftServer minecraftServer) {
6467
.digest(new FileInputStream(POLYMER_PACK_FILE.toString()).readAllBytes()))
6568
);
6669

67-
minecraftServer.setResourcePack(packIp, hash);
70+
if (minecraftServer instanceof MinecraftDedicatedServer dedicatedServer) {
71+
boolean required = false;
72+
Text prompt = Text.empty();
73+
if (dedicatedServer.getProperties().serverResourcePackProperties.isPresent()) {
74+
required = dedicatedServer.getProperties().serverResourcePackProperties.get().isRequired();
75+
prompt = dedicatedServer.getProperties().serverResourcePackProperties.get().prompt();
76+
}
77+
dedicatedServer.getProperties().serverResourcePackProperties = Optional.of(new MinecraftServer.ServerResourcePackProperties(packIp, hash, required, prompt));
78+
}
6879

6980
PolypackHostMod.LOGGER.info("Polymer resource pack host started at {} (Hash: {})", packIp, hash);
7081
} catch (Exception e) {

src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
"depends": {
2525
"fabricloader": ">=0.11.3",
26-
"minecraft": "1.18.x",
26+
"minecraft": "1.19.x",
2727
"polymer": "*",
2828
"fabric-lifecycle-events-v1": "*",
2929
"java": ">=17"

0 commit comments

Comments
 (0)