Move MapKey to api

dhyces · May 28, 2024 · bbd695b · bbd695b
1 parent af67045
commit bbd695b
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 34 deletions.
diff --git a/common/src/main/java/dev/dhyces/trimmed/api/TrimmedClientMapApi.java b/common/src/main/java/dev/dhyces/trimmed/api/TrimmedClientMapApi.java
@@ -5,7 +5,7 @@
 import dev.dhyces.trimmed.api.maps.types.AdvancedMapType;
 import dev.dhyces.trimmed.api.maps.types.MapType;
 import dev.dhyces.trimmed.impl.TrimmedClientMapApiImpl;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 
 import java.util.Map;
 

diff --git a/common/src/main/java/dev/dhyces/trimmed/api/client/ClientMapKeys.java b/common/src/main/java/dev/dhyces/trimmed/api/client/ClientMapKeys.java
@@ -1,7 +1,7 @@
 package dev.dhyces.trimmed.api.client;
 
 import dev.dhyces.trimmed.Trimmed;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import net.minecraft.resources.ResourceLocation;
 
 public class ClientMapKeys {

diff --git a/common/src/main/java/dev/dhyces/trimmed/api/data/maps/appenders/BaseMapAppender.java b/common/src/main/java/dev/dhyces/trimmed/api/data/maps/appenders/BaseMapAppender.java
@@ -1,11 +1,10 @@
 package dev.dhyces.trimmed.api.data.maps.appenders;
 
 import dev.dhyces.trimmed.api.data.maps.MapBuilder;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.Map;
-import java.util.function.Function;
 
 public abstract class BaseMapAppender<K, V> {
     protected final MapBuilder<K, V> builder;

diff --git a/...n/src/main/java/dev/dhyces/trimmed/api/data/maps/appenders/ClientRegistryMapAppender.java b/...n/src/main/java/dev/dhyces/trimmed/api/data/maps/appenders/ClientRegistryMapAppender.java
@@ -1,15 +1,9 @@
 package dev.dhyces.trimmed.api.data.maps.appenders;
 
 import dev.dhyces.trimmed.api.data.maps.MapBuilder;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
-import net.minecraft.Util;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 
-import java.util.Map;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 public class ClientRegistryMapAppender<K, V> extends BaseMapAppender<K, V> {

diff --git a/common/src/main/java/dev/dhyces/trimmed/api/maps/MapHolder.java b/common/src/main/java/dev/dhyces/trimmed/api/maps/MapHolder.java
@@ -1,6 +1,5 @@
 package dev.dhyces.trimmed.api.maps;
 
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;

diff --git a/...yces/trimmed/impl/client/maps/MapKey.java → ...a/dev/dhyces/trimmed/api/maps/MapKey.java b/...yces/trimmed/impl/client/maps/MapKey.java → ...a/dev/dhyces/trimmed/api/maps/MapKey.java
@@ -1,4 +1,4 @@
-package dev.dhyces.trimmed.impl.client.maps;
+package dev.dhyces.trimmed.api.maps;
 
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;

diff --git a/common/src/main/java/dev/dhyces/trimmed/api/maps/types/SimpleMapType.java b/common/src/main/java/dev/dhyces/trimmed/api/maps/types/SimpleMapType.java
@@ -1,9 +1,7 @@
 package dev.dhyces.trimmed.api.maps.types;
 
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.MapCodec;
 import dev.dhyces.trimmed.api.maps.MapKeyResolver;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
 import dev.dhyces.trimmed.impl.client.maps.MapKeyResolvers;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;

diff --git a/common/src/main/java/dev/dhyces/trimmed/impl/TrimmedClientMapApiImpl.java b/common/src/main/java/dev/dhyces/trimmed/impl/TrimmedClientMapApiImpl.java
@@ -5,7 +5,7 @@
 import dev.dhyces.trimmed.api.maps.MapHolder;
 import dev.dhyces.trimmed.api.maps.types.AdvancedMapType;
 import dev.dhyces.trimmed.api.maps.types.MapType;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import dev.dhyces.trimmed.impl.client.maps.manager.ClientMapManager;
 
 import java.util.Map;

diff --git a/common/src/main/java/dev/dhyces/trimmed/impl/client/atlas/OpenPalettedPermutations.java b/common/src/main/java/dev/dhyces/trimmed/impl/client/atlas/OpenPalettedPermutations.java
@@ -9,7 +9,7 @@
 import dev.dhyces.trimmed.api.TrimmedClientTagApi;
 import dev.dhyces.trimmed.api.client.ClientMapTypes;
 import dev.dhyces.trimmed.api.maps.MapHolder;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import dev.dhyces.trimmed.impl.client.tags.ClientTagKey;
 import dev.dhyces.trimmed.modhelper.services.Services;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;

diff --git a/common/src/main/java/dev/dhyces/trimmed/impl/client/maps/manager/ClientMapManager.java b/common/src/main/java/dev/dhyces/trimmed/impl/client/maps/manager/ClientMapManager.java
@@ -3,7 +3,7 @@
 import dev.dhyces.trimmed.Trimmed;
 import dev.dhyces.trimmed.api.maps.MapHolder;
 import dev.dhyces.trimmed.api.util.Utils;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import dev.dhyces.trimmed.impl.client.maps.MapKeyResolvers;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
 import net.minecraft.resources.FileToIdConverter;

diff --git a/common/src/main/java/dev/dhyces/trimmed/impl/client/maps/manager/MapHandler.java b/common/src/main/java/dev/dhyces/trimmed/impl/client/maps/manager/MapHandler.java
@@ -7,7 +7,7 @@
 import dev.dhyces.trimmed.api.data.maps.MapFile;
 import dev.dhyces.trimmed.api.maps.MapHolder;
 import dev.dhyces.trimmed.api.maps.types.MapType;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import dev.dhyces.trimmed.modhelper.services.Services;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;

diff --git a/fabric/src/main/java/dev/dhyces/trimmed/api/data/maps/BaseMapDataProvider.java b/fabric/src/main/java/dev/dhyces/trimmed/api/data/maps/BaseMapDataProvider.java
@@ -1,10 +1,9 @@
 package dev.dhyces.trimmed.api.data.maps;
 
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
-import net.minecraft.resources.ResourceLocation;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

diff --git a/fabric/src/main/java/dev/dhyces/trimmed/api/data/maps/ClientMapDataProvider.java b/fabric/src/main/java/dev/dhyces/trimmed/api/data/maps/ClientMapDataProvider.java
@@ -3,16 +3,14 @@
 import com.google.gson.JsonElement;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.JsonOps;
-import dev.dhyces.trimmed.Trimmed;
 import dev.dhyces.trimmed.api.data.maps.appenders.ClientMapAppender;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataProvider;
 
 import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
 
 public abstract class ClientMapDataProvider<K> extends BaseMapDataProvider {
 

diff --git a/fabric/src/main/java/dev/dhyces/trimmed/api/data/maps/ClientRegistryMapDataProvider.java b/fabric/src/main/java/dev/dhyces/trimmed/api/data/maps/ClientRegistryMapDataProvider.java
@@ -4,10 +4,9 @@
 import com.mojang.datafixers.util.Unit;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.JsonOps;
-import dev.dhyces.trimmed.Trimmed;
 import dev.dhyces.trimmed.api.data.maps.appenders.ClientRegistryMapAppender;
 import dev.dhyces.trimmed.api.util.Utils;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.Registry;
@@ -16,10 +15,8 @@
 import net.minecraft.resources.ResourceKey;
 
 import java.nio.file.Path;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
 
 public abstract class ClientRegistryMapDataProvider<K> extends BaseMapDataProvider {
     private final ResourceKey<? extends Registry<K>> registryKey;

diff --git a/neo/src/main/java/dev/dhyces/trimmed/api/data/maps/BaseMapDataProvider.java b/neo/src/main/java/dev/dhyces/trimmed/api/data/maps/BaseMapDataProvider.java
@@ -1,6 +1,6 @@
 package dev.dhyces.trimmed.api.data.maps;
 
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
 import net.minecraft.resources.ResourceLocation;

diff --git a/neo/src/main/java/dev/dhyces/trimmed/api/data/maps/ClientMapDataProvider.java b/neo/src/main/java/dev/dhyces/trimmed/api/data/maps/ClientMapDataProvider.java
@@ -3,9 +3,8 @@
 import com.google.gson.JsonElement;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.JsonOps;
-import dev.dhyces.trimmed.Trimmed;
 import dev.dhyces.trimmed.api.data.maps.appenders.ClientMapAppender;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
@@ -14,7 +13,6 @@
 
 import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
 
 public abstract class ClientMapDataProvider<K> extends BaseMapDataProvider<K> {
 

diff --git a/neo/src/main/java/dev/dhyces/trimmed/api/data/maps/ClientRegistryMapDataProvider.java b/neo/src/main/java/dev/dhyces/trimmed/api/data/maps/ClientRegistryMapDataProvider.java
@@ -3,10 +3,9 @@
 import com.google.gson.JsonElement;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.JsonOps;
-import dev.dhyces.trimmed.Trimmed;
 import dev.dhyces.trimmed.api.data.maps.appenders.ClientRegistryMapAppender;
 import dev.dhyces.trimmed.api.util.Utils;
-import dev.dhyces.trimmed.impl.client.maps.MapKey;
+import dev.dhyces.trimmed.api.maps.MapKey;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.Registry;
 import net.minecraft.data.CachedOutput;
@@ -18,7 +17,6 @@
 
 import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
 
 public abstract class ClientRegistryMapDataProvider<K> extends BaseMapDataProvider<K> {
     private final ResourceKey<? extends Registry<K>> registryKey;