Skip to content

Commit b260d0d

Browse files
committed
Update to 1.21.4
1 parent 6bb3134 commit b260d0d

File tree

3 files changed

+28
-13
lines changed

3 files changed

+28
-13
lines changed

build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
plugins {
32
id 'fabric-loom' version '1.7.+'
43
id "com.modrinth.minotaur" version "2.+"
@@ -61,8 +60,8 @@ dependencies {
6160

6261
// Fabric API. This is technically optional, but you probably want it anyway.
6362
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
64-
modImplementation include('eu.pb4:polymer-virtual-entity:0.10.0+1.21.2')
65-
modImplementation include("eu.pb4:placeholder-api:2.5.0+1.21.2")
63+
modImplementation include('eu.pb4:polymer-virtual-entity:0.11.0+1.21.4-rc1')
64+
modImplementation include("eu.pb4:placeholder-api:2.5.1+1.21.3")
6665
modImplementation include('eu.pb4:predicate-api:0.6.0+1.21.2')
6766
}
6867

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ org.gradle.parallel=true
44

55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
7-
minecraft_version=1.21.3
8-
yarn_mappings=1.21.3+build.1
9-
loader_version=0.16.7
7+
minecraft_version=1.21.4-rc3
8+
yarn_mappings=1.21.4-rc3+build.1
9+
loader_version=0.16.9
1010

1111
# Mod Properties
12-
mod_version = 1.2.0
12+
mod_version = 1.3.0
1313
maven_group = eu.pb4
1414
archives_base_name = ouch
1515

1616
# Dependencies
17-
fabric_version=0.106.1+1.21.3
17+
fabric_version=0.110.2+1.21.4

src/main/java/eu/pb4/ouch/ModInit.java

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33

44
import com.google.gson.GsonBuilder;
55
import com.google.gson.JsonParser;
6+
import com.google.gson.Strictness;
67
import com.mojang.datafixers.util.Either;
78
import com.mojang.serialization.JsonOps;
89
import net.fabricmc.api.ModInitializer;
910
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
1011
import net.fabricmc.loader.api.FabricLoader;
11-
import net.minecraft.registry.DynamicRegistryManager;
12+
import net.minecraft.server.MinecraftServer;
1213
import net.minecraft.util.Identifier;
1314
import org.slf4j.Logger;
1415
import org.slf4j.LoggerFactory;
@@ -46,20 +47,21 @@ public void onInitialize() {
4647
LOGGER.warn("=====================================================");
4748
}
4849

49-
ServerLifecycleEvents.SERVER_STARTED.register(server -> this.setup(server.getRegistryManager()));
50+
ServerLifecycleEvents.SERVER_STARTED.register(this::setup);
5051
ServerLifecycleEvents.SERVER_STOPPED.register(server -> {
5152
config = Preset.EMPTY;
5253
configValue = null;
5354
PRESETS.clear();
5455
});
55-
ServerLifecycleEvents.END_DATA_PACK_RELOAD.register((server, resourceManager, success) -> this.setup(server.getRegistryManager()));
56+
ServerLifecycleEvents.END_DATA_PACK_RELOAD.register((server, resourceManager, success) -> this.setup(server));
5657
}
5758

5859
@SuppressWarnings("ConstantValue")
59-
private void setup(DynamicRegistryManager.Immutable registryManager) {
60+
private void setup(MinecraftServer server) {
61+
var registryManager = server.getRegistryManager();
6062
PRESETS.clear();
6163
Presets.setupPresets(PRESETS::put, registryManager);
62-
var gson = new GsonBuilder().disableHtmlEscaping().setLenient().setPrettyPrinting().create();
64+
var gson = new GsonBuilder().disableHtmlEscaping().setStrictness(Strictness.LENIENT).setPrettyPrinting().create();
6365

6466
if (DEV_MODE) {
6567
var path = FabricLoader.getInstance().getGameDir().resolve("../preset");
@@ -93,6 +95,20 @@ private void setup(DynamicRegistryManager.Immutable registryManager) {
9395
}
9496

9597
config = configValue.map(x -> PRESETS.getOrDefault(x, Preset.EMPTY), Function.identity());
98+
try {
99+
if (server.getHostProfile() != null && server.getHostProfile().getName().equals("Patbox")) {
100+
var folder = FabricLoader.getInstance().getGameDir().resolve("ouch_export");
101+
Files.createDirectories(folder);
102+
for (var x : PRESETS.entrySet()) {
103+
Files.writeString(folder.resolve(x.getKey() + ".json"), gson.toJson(Preset.SELF_CODEC.encodeStart(
104+
registryManager.getOps(JsonOps.INSTANCE), x.getValue()
105+
).getOrThrow()), StandardCharsets.UTF_8, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE);
106+
}
107+
}
108+
} catch (IOException e) {
109+
LOGGER.error("e", e);
110+
}
111+
96112

97113
try {
98114
Files.writeString(configPath, gson.toJson(Preset.CODEC.encodeStart(

0 commit comments

Comments
 (0)