chore: rename classes/fields to match

Author: marcus8448

build.gradle.kts

@@ -22,14 +22,13 @@
 
 plugins {
     id("fabric-loom") version "0.12-SNAPSHOT" apply false
-    id("io.github.juuxel.loom-quiltflower") version("1.7.2") apply false
+    id("io.github.juuxel.loom-quiltflower") version("1.7.3") apply false
     id("org.cadixdev.licenser") version "0.6.1" apply false
 }
 
 val modGroup = rootProject.property("mod.group").toString()
 
 val minecraft = rootProject.property("minecraft.version").toString()
-val yarn = rootProject.property("yarn.build").toString()
 val loader = rootProject.property("loader.version").toString()
 val fabric = rootProject.property("fabric.version").toString()
 
@@ -74,7 +73,7 @@ subprojects {
         "mappings"(project.extensions.getByType(net.fabricmc.loom.api.LoomGradleExtensionAPI::class).officialMojangMappings())
         "modImplementation"("net.fabricmc:fabric-loader:$loader")
 
-        val fabricApi = net.fabricmc.loom.configuration.FabricApiExtension(this@subprojects);
+        val fabricApi = net.fabricmc.loom.configuration.FabricApiExtension(this@subprojects)
         fabricModules.forEach {
             "modCompileOnly"(fabricApi.module(it, fabric))
         }

gradle.properties

@@ -5,8 +5,7 @@ mod.group=dev.galacticraft
 
 # Minecraft and Fabric Loader
 minecraft.version=1.18.2
-yarn.build=3
-loader.version=0.14.6
+loader.version=0.14.8
 
 # Mod Dependencies
 fabric.version=0.53.4+1.18.2

lib/gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G
 # Mod Information
 mod.id=dynworlds
 mod.name=Dynamic Worlds
-mod.version=0.1.0
+mod.version=0.2.0
 
 # Mod Dependencies
 fabric.modules=\

lib/src/main/java/dev/galacticraft/dynworlds/api/DynamicWorldRegistry.java lib/src/main/java/dev/galacticraft/dynworlds/api/DynamicLevelRegistry.java

@@ -28,60 +28,60 @@
 import net.minecraft.world.level.levelgen.WorldGenSettings;
 
 /**
- * The registry for dynamic worlds.
+ * The registry for dynamic levels.
  * Cast {@link net.minecraft.server.MinecraftServer} to this class to access the registry.
  * It is not possible to access the registry from the client.
  *
  * @since 0.1.0
  */
-public interface DynamicWorldRegistry {
+public interface DynamicLevelRegistry {
     /**
-     * Registers a new world and updates all clients with the new world.
-     * NOTE: The world will not be loaded until the next tick.
+     * Registers a new level and updates all clients with the new level.
+     * NOTE: The level will not be loaded until the next tick.
      *
-     * @param id      The ID of the world.
+     * @param id      The ID of the level.
      *                This ID must be unique and unused in the {@link net.minecraft.core.Registry#DIMENSION_TYPE_REGISTRY} registry and the {@link WorldGenSettings#dimensions()} registry.
-     * @param stem The dimension stem for the world.
-     * @param type    The dimension type of the world.
+     * @param stem The dimension stem for the level.
+     * @param type    The dimension type of the level.
      * @since 0.1.0
      */
-    void addDynamicWorld(ResourceLocation id, LevelStem stem, DimensionType type);
+    void addDynamicLevel(ResourceLocation id, LevelStem stem, DimensionType type);
 
     /**
-     * Tests if a world with the given ID exists.
+     * Tests if a level with the given ID exists.
      *
-     * @param id The ID of the world.
-     * @return True if the world exists, false otherwise.
-     * If the world exists, you should not call {@link #addDynamicWorld(ResourceLocation, LevelStem, DimensionType)} with the same ID.
+     * @param id The ID of the level.
+     * @return True if the level exists, false otherwise.
+     * If the level exists, you should not call {@link #addDynamicLevel(ResourceLocation, LevelStem, DimensionType)} with the same ID.
      * @since 0.1.0
      */
-    boolean worldExists(ResourceLocation id);
+    boolean levelExists(ResourceLocation id);
 
     /**
-     * Returns whether a world with the given ID can be created.
+     * Returns whether a level with the given ID can be created.
      *
-     * @param id The ID of the world.
-     * @return {@code true} if the world can be created, {@code false} otherwise.
+     * @param id The ID of the level.
+     * @return {@code true} if the level can be created, {@code false} otherwise.
      * @since 0.1.0
      */
-    boolean canCreateWorld(ResourceLocation id);
+    boolean canCreateLevel(ResourceLocation id);
 
     /**
-     * Returns whether a world with the given ID can be deleted.
+     * Returns whether a level with the given ID can be deleted.
      *
-     * @param id The ID of the world.
-     * @return {@code true} if the world can be deleted, {@code false} otherwise.
+     * @param id The ID of the level.
+     * @return {@code true} if the level can be deleted, {@code false} otherwise.
      * @since 0.1.0
      */
-    boolean canDestroyWorld(ResourceLocation id);
+    boolean canDestroyLevel(ResourceLocation id);
 
     /**
-     * Erases a dynamic world from existence.
-     * Players will be removed from the world using the provided player remover.
+     * Erases a dynamic level from existence.
+     * Players will be removed from the level using the provided player remover.
      *
-     * @param id      The ID of the world.
-     * @param remover The method to remove players from the world.
+     * @param id      The ID of the level.
+     * @param remover The method to remove players from the level.
      * @since 0.1.0
      */
-    void removeDynamicWorld(ResourceLocation id, PlayerRemover remover);
+    void removeDynamicLevel(ResourceLocation id, PlayerRemover remover);
 }

lib/src/main/java/dev/galacticraft/dynworlds/impl/DynWorldsClient.java

@@ -23,8 +23,8 @@
 package dev.galacticraft.dynworlds.impl;
 
 import com.mojang.serialization.Lifecycle;
-import dev.galacticraft.dynworlds.impl.accessor.DynamicRegistryManagerImmutableImplAccessor;
-import dev.galacticraft.dynworlds.impl.mixin.SimpleRegistryAccessor;
+import dev.galacticraft.dynworlds.impl.accessor.ImmutableRegistryAccessAccessor;
+import dev.galacticraft.dynworlds.impl.mixin.MappedRegistryAccessor;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.core.Registry;
@@ -42,17 +42,17 @@ public void onInitializeClient() {
             ResourceLocation id = buf.readResourceLocation();
             int rawId = buf.readInt();
             DimensionType type = DimensionType.DIRECT_CODEC.decode(NbtOps.INSTANCE, buf.readNbt()).get().orThrow().getFirst();
-            ((DynamicRegistryManagerImmutableImplAccessor) handler.registryAccess()).unfreezeTypes(reg -> reg.registerOrOverride(OptionalInt.of(rawId), ResourceKey.create(Registry.DIMENSION_TYPE_REGISTRY, id), type, Lifecycle.stable()));
+            ((ImmutableRegistryAccessAccessor) handler.registryAccess()).unfreezeTypes(reg -> reg.registerOrOverride(OptionalInt.of(rawId), ResourceKey.create(Registry.DIMENSION_TYPE_REGISTRY, id), type, Lifecycle.stable()));
             handler.levels().add(ResourceKey.create(Registry.DIMENSION_REGISTRY, id));
         });
 
         ClientPlayNetworking.registerGlobalReceiver(Constant.id("destroy_world"), (client, handler, buf, responseSender) -> {
             ResourceLocation id = buf.readResourceLocation();
-            ((DynamicRegistryManagerImmutableImplAccessor) handler.registryAccess()).unfreezeTypes(reg -> {
+            ((ImmutableRegistryAccessAccessor) handler.registryAccess()).unfreezeTypes(reg -> {
                 DimensionType dimensionType = reg.get(id);
                 int rawId = reg.getId(dimensionType);
                 if (dimensionType != null) {
-                    SimpleRegistryAccessor<DimensionType> accessor = (SimpleRegistryAccessor<DimensionType>) reg;
+                    MappedRegistryAccessor<DimensionType> accessor = (MappedRegistryAccessor<DimensionType>) reg;
                     accessor.getLifecycles().remove(dimensionType);
                     accessor.getById().remove(rawId);
                     accessor.getToId().removeInt(dimensionType);

lib/src/main/java/dev/galacticraft/dynworlds/impl/accessor/DynamicRegistryManagerImmutableImplAccessor.java lib/src/main/java/dev/galacticraft/dynworlds/impl/accessor/ImmutableRegistryAccessAccessor.java

@@ -25,9 +25,9 @@
 import dev.galacticraft.dynworlds.impl.util.RegistryAppender;
 import net.minecraft.world.level.dimension.DimensionType;
 
-public interface DynamicRegistryManagerImmutableImplAccessor {
+public interface ImmutableRegistryAccessAccessor {
     /**
-     * Unfreezes the DimensionType registry for the addition and removal of worlds.
+     * Unfreezes the {@link DimensionType} registry for the addition and removal of worlds.
      *
      * @param appender Callback to execute while the registry is unfrozen.
      */

lib/src/main/java/dev/galacticraft/dynworlds/impl/accessor/SavePropertiesAccessor.java lib/src/main/java/dev/galacticraft/dynworlds/impl/accessor/PrimaryLevelDataAccessor.java

@@ -27,10 +27,10 @@
 
 import java.util.Map;
 
-public interface SavePropertiesAccessor {
-    void addDynamicWorld(ResourceLocation id, LevelStem options);
+public interface PrimaryLevelDataAccessor {
+    void addDynamicLevel(ResourceLocation id, LevelStem stem);
 
-    void removeDynamicWorld(ResourceLocation id);
+    void removeDynamicLevel(ResourceLocation id);
 
     Map<ResourceLocation, LevelStem> getDynamicWorlds();
 }

lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/ThreadedAnvilChunkStorageAccessor.java lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/ChunkMapAccessor.java

@@ -27,7 +27,7 @@
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(ChunkMap.class)
-public interface ThreadedAnvilChunkStorageAccessor {
+public interface ChunkMapAccessor {
     @Accessor("viewDistance")
     int getViewDistance();
 }

lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/ChunkTicketManagerAccessor.java lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/DistanceManagerAccessor.java

@@ -27,7 +27,7 @@
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(DistanceManager.class)
-public interface ChunkTicketManagerAccessor {
+public interface DistanceManagerAccessor {
     @Accessor("simulationDistance")
     int getSimulationDistance();
 }

lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/RegistryEntryReferenceInvoker.java lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/HolderReferenceInvoker.java

@@ -28,7 +28,7 @@
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(Holder.Reference.class)
-public interface RegistryEntryReferenceInvoker<T> {
+public interface HolderReferenceInvoker<T> {
     @Invoker("bind")
     void callBind(ResourceKey<T> key, T value);
 }

lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/DynamicRegistryManagerImmutableImplMixin.java lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/ImmutableRegistryAccessMixin.java

@@ -22,7 +22,7 @@
 
 package dev.galacticraft.dynworlds.impl.mixin;
 
-import dev.galacticraft.dynworlds.impl.accessor.DynamicRegistryManagerImmutableImplAccessor;
+import dev.galacticraft.dynworlds.impl.accessor.ImmutableRegistryAccessAccessor;
 import dev.galacticraft.dynworlds.impl.util.RegistryAppender;
 import net.minecraft.core.DefaultedRegistry;
 import net.minecraft.core.MappedRegistry;
@@ -38,7 +38,7 @@
 import java.util.Map;
 
 @Mixin(RegistryAccess.ImmutableRegistryAccess.class)
-public abstract class DynamicRegistryManagerImmutableImplMixin implements DynamicRegistryManagerImmutableImplAccessor {
+public abstract class ImmutableRegistryAccessMixin implements ImmutableRegistryAccessAccessor {
     @Shadow
     @Final
     private Map<? extends ResourceKey<? extends Registry<?>>, ? extends Registry<?>> registries;
@@ -50,7 +50,7 @@ public void unfreezeTypes(@NotNull RegistryAppender<DimensionType> appender) {
                 // if the registry is not a vanilla registry type, we cannot guarantee that unfreezing the registry won't break stuff.
                 && (simple.getClass() == MappedRegistry.class || simple.getClass() == DefaultedRegistry.class)
         ) {
-            SimpleRegistryAccessor<DimensionType> accessor = ((SimpleRegistryAccessor<DimensionType>) simple);
+            MappedRegistryAccessor<DimensionType> accessor = ((MappedRegistryAccessor<DimensionType>) simple);
             if (accessor.isFrozen()) {
                 accessor.setFrozen(false);  // safe as there should be no new intrusive holders of this registry as it was already frozen
                 appender.register(simple);

lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/SimpleRegistryAccessor.java lib/src/main/java/dev/galacticraft/dynworlds/impl/mixin/MappedRegistryAccessor.java

@@ -36,7 +36,7 @@
 import java.util.Map;
 
 @Mixin(MappedRegistry.class)
-public interface SimpleRegistryAccessor<T> {
+public interface MappedRegistryAccessor<T> {
     @Accessor("byId")
     ObjectList<Holder.Reference<T>> getById();