Skip to content

Commit f75f3a2

Browse files
committed
Clean up registerdim command, remove git versioning
1 parent ab3130b commit f75f3a2

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apply plugin: "net.minecraftforge.gradle"
2020
def gitCommitHash = 'git rev-parse --verify --short HEAD'.execute().text.trim()
2121
def isRelease = (System.getenv("CM_RELEASE") ?: "false").equalsIgnoreCase("true")
2222

23-
version = isRelease ? mod_version : "${mod_version}+nightly-${gitCommitHash}"
23+
version = mod_version
2424
group = "dev.compactmods"
2525
archivesBaseName = mod_id
2626

src/main/java/dev/compactmods/machines/command/ReaddDimensionCommand.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package dev.compactmods.machines.command;
22

33
import java.io.IOException;
4-
import java.io.InputStreamReader;
54
import java.nio.file.Files;
65
import java.time.ZonedDateTime;
76
import java.time.format.DateTimeFormatter;
87
import java.util.concurrent.Executor;
98
import com.google.common.collect.ImmutableList;
10-
import com.google.gson.Gson;
11-
import com.google.gson.JsonObject;
129
import com.mojang.brigadier.builder.ArgumentBuilder;
1310
import com.mojang.brigadier.context.CommandContext;
1411
import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -24,11 +21,9 @@
2421
import net.minecraft.resources.RegistryReadOps;
2522
import net.minecraft.resources.RegistryResourceAccess;
2623
import net.minecraft.resources.ResourceKey;
27-
import net.minecraft.resources.ResourceLocation;
2824
import net.minecraft.server.MinecraftServer;
2925
import net.minecraft.server.level.ServerLevel;
3026
import net.minecraft.server.level.progress.ChunkProgressListener;
31-
import net.minecraft.server.packs.resources.Resource;
3227
import net.minecraft.world.level.Level;
3328
import net.minecraft.world.level.border.BorderChangeListener;
3429
import net.minecraft.world.level.dimension.LevelStem;
@@ -76,28 +71,13 @@ private static void createAndRegisterWorldAndDimension(final MinecraftServer ser
7671

7772
final var serverResources = server.getResourceManager();
7873

79-
Resource dimFile = null;
80-
try {
81-
dimFile = serverResources.getResource(new ResourceLocation(CompactMachines.MOD_ID, "dimension/compact_world.json"));
82-
} catch (IOException e) {
83-
CompactMachines.LOGGER.error("Failed to register dimension from datapack settings.", e);
84-
}
85-
86-
if (dimFile == null) {
87-
return;
88-
}
89-
9074
// only back up level.dat in production
9175
if (FMLEnvironment.production && !doLevelFileBackup(server)) return;
9276

93-
var g = new Gson();
94-
final var jsonDim = g.fromJson(new InputStreamReader(dimFile.getInputStream()), JsonObject.class);
95-
9677
var reg = server.registryAccess();
9778
var cmDimType = reg.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY)
9879
.get(Registration.COMPACT_DIMENSION_DIM_TYPE);
9980

100-
// TODO - Figure out how to either re-read dimension info from data structure, or kick the level.dat into behaving
10181
var ops = RegistryReadOps.create(JsonOps.INSTANCE, serverResources, reg);
10282

10383
var resourceAccess = RegistryResourceAccess.forResourceManager(serverResources);

0 commit comments

Comments
 (0)