diff --git a/src/main/java/org/geysermc/packgenerator/mappings/GeyserItemMapper.java b/src/main/java/org/geysermc/packgenerator/mapping/GeyserItemMapper.java similarity index 96% rename from src/main/java/org/geysermc/packgenerator/mappings/GeyserItemMapper.java rename to src/main/java/org/geysermc/packgenerator/mapping/GeyserItemMapper.java index 98c7e73..08a3180 100644 --- a/src/main/java/org/geysermc/packgenerator/mappings/GeyserItemMapper.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/GeyserItemMapper.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mappings; +package org.geysermc.packgenerator.mapping; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import net.minecraft.client.Minecraft; @@ -24,9 +24,9 @@ import net.minecraft.world.item.equipment.trim.TrimMaterial; import net.minecraft.world.level.Level; import org.geysermc.packgenerator.accessor.BlockModelWrapperLocationAccessor; import org.geysermc.packgenerator.accessor.SelectItemModelCasesAccessor; -import org.geysermc.packgenerator.mappings.predicate.GeyserConditionPredicate; -import org.geysermc.packgenerator.mappings.predicate.GeyserMatchPredicate; -import org.geysermc.packgenerator.mappings.predicate.GeyserPredicate; +import org.geysermc.packgenerator.mapping.predicate.GeyserConditionPredicate; +import org.geysermc.packgenerator.mapping.predicate.GeyserMatchPredicate; +import org.geysermc.packgenerator.mapping.predicate.GeyserPredicate; import org.geysermc.packgenerator.mixin.ConditionalItemModelAccessor; import org.geysermc.packgenerator.mixin.SelectItemModelAccessor; diff --git a/src/main/java/org/geysermc/packgenerator/mappings/GeyserMapping.java b/src/main/java/org/geysermc/packgenerator/mapping/GeyserMapping.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/mappings/GeyserMapping.java rename to src/main/java/org/geysermc/packgenerator/mapping/GeyserMapping.java index a91d036..3c26ef2 100644 --- a/src/main/java/org/geysermc/packgenerator/mappings/GeyserMapping.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/GeyserMapping.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mappings; +package org.geysermc.packgenerator.mapping; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; @@ -6,7 +6,7 @@ import net.minecraft.core.component.DataComponentPatch; import net.minecraft.core.component.DataComponentType; import net.minecraft.core.component.DataComponents; import net.minecraft.resources.ResourceLocation; -import org.geysermc.packgenerator.mappings.predicate.GeyserPredicate; +import org.geysermc.packgenerator.mapping.predicate.GeyserPredicate; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/geysermc/packgenerator/mappings/GeyserMappings.java b/src/main/java/org/geysermc/packgenerator/mapping/GeyserMappings.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/mappings/GeyserMappings.java rename to src/main/java/org/geysermc/packgenerator/mapping/GeyserMappings.java index caf0b2c..6d2d149 100644 --- a/src/main/java/org/geysermc/packgenerator/mappings/GeyserMappings.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/GeyserMappings.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mappings; +package org.geysermc.packgenerator.mapping; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; diff --git a/src/main/java/org/geysermc/packgenerator/mappings/predicate/GeyserConditionPredicate.java b/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserConditionPredicate.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/mappings/predicate/GeyserConditionPredicate.java rename to src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserConditionPredicate.java index 1e65fbb..eddb858 100644 --- a/src/main/java/org/geysermc/packgenerator/mappings/predicate/GeyserConditionPredicate.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserConditionPredicate.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mappings.predicate; +package org.geysermc.packgenerator.mapping.predicate; import com.google.common.base.Suppliers; import com.mojang.serialization.Codec; diff --git a/src/main/java/org/geysermc/packgenerator/mappings/predicate/GeyserMatchPredicate.java b/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserMatchPredicate.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/mappings/predicate/GeyserMatchPredicate.java rename to src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserMatchPredicate.java index ed61075..7f1d02f 100644 --- a/src/main/java/org/geysermc/packgenerator/mappings/predicate/GeyserMatchPredicate.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserMatchPredicate.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mappings.predicate; +package org.geysermc.packgenerator.mapping.predicate; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/org/geysermc/packgenerator/mappings/predicate/GeyserPredicate.java b/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserPredicate.java similarity index 95% rename from src/main/java/org/geysermc/packgenerator/mappings/predicate/GeyserPredicate.java rename to src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserPredicate.java index 475a6e1..a94c889 100644 --- a/src/main/java/org/geysermc/packgenerator/mappings/predicate/GeyserPredicate.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserPredicate.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mappings.predicate; +package org.geysermc.packgenerator.mapping.predicate; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/org/geysermc/packgenerator/pack/BedrockTextures.java b/src/main/java/org/geysermc/packgenerator/pack/BedrockTextures.java index 2900aae..409e1c2 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/BedrockTextures.java +++ b/src/main/java/org/geysermc/packgenerator/pack/BedrockTextures.java @@ -2,7 +2,7 @@ package org.geysermc.packgenerator.pack; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Codec; -import org.geysermc.packgenerator.mappings.GeyserMapping; +import org.geysermc.packgenerator.mapping.GeyserMapping; import java.util.HashMap; import java.util.List;