Fix style

Legacy-Fabric · Nov 25, 2024 · 43e3469 · 43e3469
1 parent 20a2216
commit 43e3469
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 19 deletions.
diff --git a/...c-api-v1/common/src/main/java/net/legacyfabric/fabric/api/registry/v1/RegistryHelper.java b/...c-api-v1/common/src/main/java/net/legacyfabric/fabric/api/registry/v1/RegistryHelper.java
@@ -21,8 +21,6 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.enchantment.Enchantment;
@@ -33,6 +31,7 @@
 
 import net.legacyfabric.fabric.api.event.Event;
 import net.legacyfabric.fabric.api.event.EventFactory;
+import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry;
 import net.legacyfabric.fabric.api.util.BeforeMC;
 import net.legacyfabric.fabric.api.util.Identifier;
 import net.legacyfabric.fabric.api.util.SinceMC;

diff --git a/.../java/net/legacyfabric/fabric/mixin/registry/sync/versioned/BiDefaultedRegistryMixin.java b/.../java/net/legacyfabric/fabric/mixin/registry/sync/versioned/BiDefaultedRegistryMixin.java
@@ -19,14 +19,13 @@
 
 import java.util.Objects;
 
-import net.legacyfabric.fabric.api.registry.v2.registry.holder.SyncedFabricRegistry;
-
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.util.registry.BiDefaultedRegistry;
 
+import net.legacyfabric.fabric.api.registry.v2.registry.holder.SyncedFabricRegistry;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.DesynchronizeableRegistrable;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.SyncedRegistrable;
 import net.legacyfabric.fabric.api.util.Identifier;

diff --git a/...mon/src/main/java/net/legacyfabric/fabric/impl/registry/RegistryHelperImplementation.java b/...mon/src/main/java/net/legacyfabric/fabric/impl/registry/RegistryHelperImplementation.java
@@ -24,9 +24,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
-import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry;
-import net.legacyfabric.fabric.api.registry.v2.registry.holder.SyncedFabricRegistry;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.util.PacketByteBuf;
 
@@ -38,7 +35,10 @@
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryEntryAddedCallback;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryInitializedEvent;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryRemapCallback;
+import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
+import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry;
 import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistryEntry;
+import net.legacyfabric.fabric.api.registry.v2.registry.holder.SyncedFabricRegistry;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.DesynchronizeableRegistrable;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.Registrable;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.RegistryEntryCreator;

diff --git a/...c-api-v2/common/src/main/java/net/legacyfabric/fabric/impl/registry/RegistryRemapper.java b/...c-api-v2/common/src/main/java/net/legacyfabric/fabric/impl/registry/RegistryRemapper.java
@@ -25,11 +25,10 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
-import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
-
 import net.minecraft.nbt.NbtCompound;
 
 import net.legacyfabric.fabric.api.logger.v1.Logger;
+import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
 import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistryEntry;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.IdsHolder;
 import net.legacyfabric.fabric.api.util.Identifier;

diff --git a/.../main/java/net/legacyfabric/fabric/impl/registry/SyncedRegistrableFabricRegistryImpl.java b/.../main/java/net/legacyfabric/fabric/impl/registry/SyncedRegistrableFabricRegistryImpl.java
@@ -21,7 +21,6 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
 import org.apache.commons.lang3.Validate;
 import org.jetbrains.annotations.NotNull;
 
@@ -31,6 +30,7 @@
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryBeforeAddCallback;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryEntryAddedCallback;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryRemapCallback;
+import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.IdsHolder;
 import net.legacyfabric.fabric.api.util.Identifier;
 

diff --git a/...src/main/java/net/legacyfabric/fabric/impl/registry/wrapper/MapFabricRegistryWrapper.java b/...src/main/java/net/legacyfabric/fabric/impl/registry/wrapper/MapFabricRegistryWrapper.java
@@ -21,13 +21,13 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import net.legacyfabric.fabric.api.registry.v2.registry.RegistrableFabricRegistry;
 import org.jetbrains.annotations.NotNull;
 
 import net.legacyfabric.fabric.api.event.Event;
 import net.legacyfabric.fabric.api.event.EventFactory;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryBeforeAddCallback;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryEntryAddedCallback;
+import net.legacyfabric.fabric.api.registry.v2.registry.RegistrableFabricRegistry;
 import net.legacyfabric.fabric.api.util.Identifier;
 
 public class MapFabricRegistryWrapper<K, V> implements RegistrableFabricRegistry<V> {

diff --git a/.../java/net/legacyfabric/fabric/impl/registry/wrapper/SyncedArrayFabricRegistryWrapper.java b/.../java/net/legacyfabric/fabric/impl/registry/wrapper/SyncedArrayFabricRegistryWrapper.java
@@ -24,14 +24,14 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
 import org.jetbrains.annotations.NotNull;
 
 import net.legacyfabric.fabric.api.event.Event;
 import net.legacyfabric.fabric.api.event.EventFactory;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryBeforeAddCallback;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryEntryAddedCallback;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryRemapCallback;
+import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.IdsHolder;
 import net.legacyfabric.fabric.api.util.Identifier;
 import net.legacyfabric.fabric.impl.registry.IdsHolderImpl;

diff --git a/...va/net/legacyfabric/fabric/impl/registry/wrapper/SyncedArrayMapFabricRegistryWrapper.java b/...va/net/legacyfabric/fabric/impl/registry/wrapper/SyncedArrayMapFabricRegistryWrapper.java
@@ -22,14 +22,14 @@
 import java.util.function.Function;
 
 import com.google.common.collect.BiMap;
-import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
 import org.jetbrains.annotations.NotNull;
 
 import net.legacyfabric.fabric.api.event.Event;
 import net.legacyfabric.fabric.api.event.EventFactory;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryBeforeAddCallback;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryEntryAddedCallback;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryRemapCallback;
+import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.IdsHolder;
 import net.legacyfabric.fabric.api.util.Identifier;
 import net.legacyfabric.fabric.impl.registry.IdsHolderImpl;

diff --git a/...mon/src/main/java/net/legacyfabric/fabric/mixin/registry/sync/MutableRegistryMixinV2.java b/...mon/src/main/java/net/legacyfabric/fabric/mixin/registry/sync/MutableRegistryMixinV2.java
@@ -19,8 +19,6 @@
 
 import java.util.Map;
 
-import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry;
-
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -32,6 +30,7 @@
 import net.legacyfabric.fabric.api.event.EventFactory;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryBeforeAddCallback;
 import net.legacyfabric.fabric.api.registry.v2.event.RegistryEntryAddedCallback;
+import net.legacyfabric.fabric.api.registry.v2.registry.holder.FabricRegistry;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.Registrable;
 import net.legacyfabric.fabric.api.util.Identifier;
 import net.legacyfabric.fabric.impl.registry.RegistryHelperImplementation;

diff --git a/...mmon/src/main/java/net/legacyfabric/fabric/mixin/registry/sync/SimpleRegistryMixinV2.java b/...mmon/src/main/java/net/legacyfabric/fabric/mixin/registry/sync/SimpleRegistryMixinV2.java
@@ -17,12 +17,11 @@
 
 package net.legacyfabric.fabric.mixin.registry.sync;
 
-import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
-
 import org.spongepowered.asm.mixin.Mixin;
 
 import net.minecraft.util.registry.SimpleRegistry;
 
+import net.legacyfabric.fabric.api.registry.v2.registry.SyncedRegistrableFabricRegistry;
 import net.legacyfabric.fabric.api.registry.v2.registry.registrable.DesynchronizeableRegistrable;
 
 @Mixin(SimpleRegistry.class)

diff --git a/legacy-fabric-registry-sync-api-v2/common/src/main/resources/fabric.mod.json b/legacy-fabric-registry-sync-api-v2/common/src/main/resources/fabric.mod.json
@@ -30,8 +30,8 @@
   ],
   "custom": {
     "loom:injected_interfaces": {
-      "net/minecraft/class_1367": ["net/legacyfabric/fabric/api/registry/v2/registry/holder/Registry"],
-      "net/minecraft/class_1943": ["net/legacyfabric/fabric/api/registry/v2/registry/holder/SyncedRegistry"],
+      "net/minecraft/class_1367": ["net/legacyfabric/fabric/api/registry/v2/registry/holder/FabricRegistry"],
+      "net/minecraft/class_1943": ["net/legacyfabric/fabric/api/registry/v2/registry/holder/SyncedFabricRegistry"],
       "net/minecraft/class_1942": ["net/legacyfabric/fabric/api/registry/v2/registry/registrable/IdsHolder"]
     },
     "modmenu": {