fix: Fix en_us translations

Also fixed more class references.
steves-underwater-paradise · Jul 16, 2024 · 263826c · 263826c
1 parent 6747758
commit 263826c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/...n/compat/distanthorizons/common/wrappers/world/gen/DHBatchGenerationEnvironmentMixin.java b/...n/compat/distanthorizons/common/wrappers/world/gen/DHBatchGenerationEnvironmentMixin.java
@@ -1,6 +1,7 @@
 package io.github.steveplays28.noisiumchunkmanager.mixin.compat.distanthorizons.common.wrappers.world.gen;
 
 import com.llamalad7.mixinextras.sugar.Local;
+import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension;
 import loaderCommon.fabric.com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.server.world.ThreadedAnvilChunkStorage;
@@ -16,6 +17,6 @@
 public class DHBatchGenerationEnvironmentMixin {
  @Redirect(method = "getChunkNbtData", at = @At(value = "FIELD", target = "Lnet/minecraft/server/world/ThreadedAnvilChunkStorage;worker:Lnet/minecraft/world/storage/StorageIoWorker;", opcode = Opcodes.GETFIELD))
  private @NotNull StorageIoWorker noisiumchunkmanager$getIoWorkerFromNoisiumServerWorldChunkManager(@Nullable ThreadedAnvilChunkStorage instance, @Local(ordinal = 0) @NotNull ServerWorld serverWorld) {
- return (StorageIoWorker) ((io.github.steveplays28.noisiumchunkmanager.experimental.extension.world.server.ServerWorldExtension) serverWorld).noisiumchunkmanager$getServerWorldChunkManager().getChunkIoWorker();
+ return (StorageIoWorker) ((ServerWorldExtension) serverWorld).noisiumchunkmanager$getServerWorldChunkManager().getChunkIoWorker();
  }
 }
diff --git a/...rc/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/ChunkRegionMixin.java b/...rc/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/ChunkRegionMixin.java
@@ -1,5 +1,6 @@
 package io.github.steveplays28.noisiumchunkmanager.mixin.world;
 
+import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.fluid.FluidState;
@@ -59,7 +60,7 @@ public abstract class ChunkRegionMixin implements StructureWorldAccess {
  @Inject(method = "getChunk(IILnet/minecraft/world/chunk/ChunkStatus;Z)Lnet/minecraft/world/chunk/Chunk;", at = @At(value = "HEAD"), cancellable = true)
  private void noisiumchunkmanager$getIoWorldChunkIfChunkIsUnloaded(int chunkPositionX, int chunkPositionZ, @NotNull ChunkStatus leastStatus, boolean create, @NotNull CallbackInfoReturnable<Chunk> cir) {
  if (!this.isChunkLoaded(chunkPositionX, chunkPositionZ)) {
- cir.setReturnValue(((io.github.steveplays28.noisiumchunkmanager.experimental.extension.world.server.ServerWorldExtension) this.world).noisiumchunkmanager$getServerWorldChunkManager().getIoWorldChunk(
+ cir.setReturnValue(((ServerWorldExtension) this.world).noisiumchunkmanager$getServerWorldChunkManager().getIoWorldChunk(
  new ChunkPos(chunkPositionX, chunkPositionZ)));
  return;
  }
@@ -77,7 +78,7 @@ public abstract class ChunkRegionMixin implements StructureWorldAccess {
  @Inject(method = "setBlockState", at = @At(value = "HEAD"), cancellable = true)
  private void noisiumchunkmanager$setBlockStateToIoWorldChunkIfChunkIsUnloaded(@NotNull BlockPos blockPos, @NotNull BlockState blockState, int flags, int maxUpdateDepth, @NotNull CallbackInfoReturnable<Boolean> cir) {
  if (!this.isChunkLoaded(ChunkSectionPos.getSectionCoord(blockPos.getX()), ChunkSectionPos.getSectionCoord(blockPos.getZ()))) {
- ((io.github.steveplays28.noisiumchunkmanager.experimental.extension.world.server.ServerWorldExtension) this.world).noisiumchunkmanager$getServerWorldChunkManager().getIoWorldChunk(
+ ((ServerWorldExtension) this.world).noisiumchunkmanager$getServerWorldChunkManager().getIoWorldChunk(
  new ChunkPos(blockPos)).setBlockState(blockPos, blockState, false);
  cir.setReturnValue(true);
  }
@@ -86,15 +87,15 @@ public abstract class ChunkRegionMixin implements StructureWorldAccess {
  @Inject(method = "getFluidState", at = @At(value = "HEAD"), cancellable = true)
  private void noisiumchunkmanager$getFluidStateFromIoWorldChunkIfChunkIsUnloaded(@NotNull BlockPos blockPos, @NotNull CallbackInfoReturnable<FluidState> cir) {
  if (!this.isChunkLoaded(ChunkSectionPos.getSectionCoord(blockPos.getX()), ChunkSectionPos.getSectionCoord(blockPos.getZ()))) {
- cir.setReturnValue(((io.github.steveplays28.noisiumchunkmanager.experimental.extension.world.server.ServerWorldExtension) this.world).noisiumchunkmanager$getServerWorldChunkManager().getIoWorldChunk(
+ cir.setReturnValue(((ServerWorldExtension) this.world).noisiumchunkmanager$getServerWorldChunkManager().getIoWorldChunk(
  new ChunkPos(blockPos)).getFluidState(blockPos));
  }
  }
 
  @Inject(method = "getTopY", at = @At(value = "HEAD"), cancellable = true)
  private void noisiumchunkmanager$getTopYFromIoWorldChunkIfChunkIsUnloaded(@NotNull Heightmap.Type heightmap, int blockPositionX, int blockPositionZ, @NotNull CallbackInfoReturnable<Integer> cir) {
  if (!this.isChunkLoaded(ChunkSectionPos.getSectionCoord(blockPositionX), ChunkSectionPos.getSectionCoord(blockPositionZ))) {
- cir.setReturnValue(((io.github.steveplays28.noisiumchunkmanager.experimental.extension.world.server.ServerWorldExtension) this.world).noisiumchunkmanager$getServerWorldChunkManager().getIoWorldChunk(
+ cir.setReturnValue(((ServerWorldExtension) this.world).noisiumchunkmanager$getServerWorldChunkManager().getIoWorldChunk(
  new ChunkPos(
  ChunkSectionPos.getSectionCoord(blockPositionX),
  ChunkSectionPos.getSectionCoord(blockPositionZ)

diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/WorldMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/WorldMixin.java
@@ -1,5 +1,6 @@
 package io.github.steveplays28.noisiumchunkmanager.mixin.world;
 
+import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension;
 import net.minecraft.block.BlockState;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.util.math.BlockPos;
@@ -25,7 +26,7 @@ public abstract class WorldMixin {
  return;
  }
 
- var noisiumServerWorldChunkManager = ((io.github.steveplays28.noisiumchunkmanager.experimental.extension.world.server.ServerWorldExtension) this).noisiumchunkmanager$getServerWorldChunkManager();
+ var noisiumServerWorldChunkManager = ((ServerWorldExtension) this).noisiumchunkmanager$getServerWorldChunkManager();
  var chunkPosition = new ChunkPos(chunkPositionX, chunkPositionZ);
  if (!noisiumServerWorldChunkManager.isChunkLoaded(chunkPosition)) {
  cir.setReturnValue(noisiumServerWorldChunkManager.getIoWorldChunk(chunkPosition));
@@ -41,7 +42,7 @@ public abstract class WorldMixin {
  return;
  }
 
- var noisiumServerWorldChunkManager = ((io.github.steveplays28.noisiumchunkmanager.experimental.extension.world.server.ServerWorldExtension) this).noisiumchunkmanager$getServerWorldChunkManager();
+ var noisiumServerWorldChunkManager = ((ServerWorldExtension) this).noisiumchunkmanager$getServerWorldChunkManager();
  var chunkPosition = new ChunkPos(blockPosition);
  if (!noisiumServerWorldChunkManager.isChunkLoaded(chunkPosition)) {
  cir.setReturnValue(noisiumServerWorldChunkManager.getIoWorldChunk(chunkPosition).getBlockState(blockPosition));
@@ -57,7 +58,7 @@ public abstract class WorldMixin {
  return;
  }
 
- var noisiumServerWorldChunkManager = ((io.github.steveplays28.noisiumchunkmanager.experimental.extension.world.server.ServerWorldExtension) this).noisiumchunkmanager$getServerWorldChunkManager();
+ var noisiumServerWorldChunkManager = ((ServerWorldExtension) this).noisiumchunkmanager$getServerWorldChunkManager();
  var chunkPosition = new ChunkPos(blockPosition);
  if (!noisiumServerWorldChunkManager.isChunkLoaded(chunkPosition)) {
  cir.setReturnValue(noisiumServerWorldChunkManager.getIoWorldChunk(chunkPosition).getFluidState(blockPosition));

diff --git a/common/src/main/resources/assets/noisiumchunkmanager/lang/en_us.json b/common/src/main/resources/assets/noisiumchunkmanager/lang/en_us.json
@@ -1,6 +1,6 @@
 {
- "yacl3.config.noisium:config.category.server": "Server",
- "yacl3.config.noisium:config.category.server.group.serverWorldChunkManager": "Server World Chunk Manager (experimental)",
- "yacl3.config.noisium:config.serverWorldChunkManagerThreads": "Server World Chunk Manager Threads",
- "yacl3.config.noisium:config.serverWorldChunkManagerLightingThreads": "Server World Chunk Manager Lighting Threads"
+ "yacl3.config.noisiumchunkmanager:config.category.server": "Server",
+ "yacl3.config.noisiumchunkmanager:config.category.server.group.serverWorldChunkManager": "Server World Chunk Manager (experimental)",
+ "yacl3.config.noisiumchunkmanager:config.serverWorldChunkManagerThreads": "Server World Chunk Manager Threads",
+ "yacl3.config.noisiumchunkmanager:config.serverWorldChunkManagerLightingThreads": "Server World Chunk Manager Lighting Threads"
 }