From cc317e34d1ca994b4cbafe852f947d4915e5f054 Mon Sep 17 00:00:00 2001 From: Eclipse Date: Tue, 1 Jul 2025 10:51:21 +0000 Subject: [PATCH] mappings -> mapping.geyser --- .../mapping/{ => geyser}/GeyserItemMapper.java | 8 ++++---- .../packgenerator/mapping/{ => geyser}/GeyserMapping.java | 4 ++-- .../mapping/{ => geyser}/GeyserMappings.java | 2 +- .../{ => geyser}/predicate/GeyserConditionPredicate.java | 2 +- .../{ => geyser}/predicate/GeyserMatchPredicate.java | 2 +- .../mapping/{ => geyser}/predicate/GeyserPredicate.java | 2 +- .../java/org/geysermc/packgenerator/pack/BedrockPack.java | 5 ++++- .../org/geysermc/packgenerator/pack/BedrockTextures.java | 2 +- 8 files changed, 15 insertions(+), 12 deletions(-) rename src/main/java/org/geysermc/packgenerator/mapping/{ => geyser}/GeyserItemMapper.java (95%) rename src/main/java/org/geysermc/packgenerator/mapping/{ => geyser}/GeyserMapping.java (97%) rename src/main/java/org/geysermc/packgenerator/mapping/{ => geyser}/GeyserMappings.java (98%) rename src/main/java/org/geysermc/packgenerator/mapping/{ => geyser}/predicate/GeyserConditionPredicate.java (98%) rename src/main/java/org/geysermc/packgenerator/mapping/{ => geyser}/predicate/GeyserMatchPredicate.java (98%) rename src/main/java/org/geysermc/packgenerator/mapping/{ => geyser}/predicate/GeyserPredicate.java (95%) diff --git a/src/main/java/org/geysermc/packgenerator/mapping/GeyserItemMapper.java b/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserItemMapper.java similarity index 95% rename from src/main/java/org/geysermc/packgenerator/mapping/GeyserItemMapper.java rename to src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserItemMapper.java index 08a3180..e6743e3 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/GeyserItemMapper.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserItemMapper.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping; +package org.geysermc.packgenerator.mapping.geyser; 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.mapping.predicate.GeyserConditionPredicate; -import org.geysermc.packgenerator.mapping.predicate.GeyserMatchPredicate; -import org.geysermc.packgenerator.mapping.predicate.GeyserPredicate; +import org.geysermc.packgenerator.mapping.geyser.predicate.GeyserConditionPredicate; +import org.geysermc.packgenerator.mapping.geyser.predicate.GeyserMatchPredicate; +import org.geysermc.packgenerator.mapping.geyser.predicate.GeyserPredicate; import org.geysermc.packgenerator.mixin.ConditionalItemModelAccessor; import org.geysermc.packgenerator.mixin.SelectItemModelAccessor; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/GeyserMapping.java b/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMapping.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/mapping/GeyserMapping.java rename to src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMapping.java index 3c26ef2..be8f22b 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/GeyserMapping.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMapping.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping; +package org.geysermc.packgenerator.mapping.geyser; 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.mapping.predicate.GeyserPredicate; +import org.geysermc.packgenerator.mapping.geyser.predicate.GeyserPredicate; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/GeyserMappings.java b/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMappings.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/mapping/GeyserMappings.java rename to src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMappings.java index 6d2d149..96e2fcd 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/GeyserMappings.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMappings.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping; +package org.geysermc.packgenerator.mapping.geyser; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserConditionPredicate.java b/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserConditionPredicate.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserConditionPredicate.java rename to src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserConditionPredicate.java index eddb858..b46d6ce 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserConditionPredicate.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserConditionPredicate.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.predicate; +package org.geysermc.packgenerator.mapping.geyser.predicate; import com.google.common.base.Suppliers; import com.mojang.serialization.Codec; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserMatchPredicate.java b/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserMatchPredicate.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserMatchPredicate.java rename to src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserMatchPredicate.java index 7f1d02f..dba7cba 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserMatchPredicate.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserMatchPredicate.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.predicate; +package org.geysermc.packgenerator.mapping.geyser.predicate; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserPredicate.java b/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserPredicate.java similarity index 95% rename from src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserPredicate.java rename to src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserPredicate.java index a94c889..fee35bb 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/predicate/GeyserPredicate.java +++ b/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserPredicate.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.predicate; +package org.geysermc.packgenerator.mapping.geyser.predicate; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/org/geysermc/packgenerator/pack/BedrockPack.java b/src/main/java/org/geysermc/packgenerator/pack/BedrockPack.java index 5351057..79ac6f7 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/BedrockPack.java +++ b/src/main/java/org/geysermc/packgenerator/pack/BedrockPack.java @@ -4,10 +4,12 @@ import net.fabricmc.loader.api.FabricLoader; import net.minecraft.world.item.ItemStack; import org.geysermc.packgenerator.CodecUtil; import org.geysermc.packgenerator.PackConstants; -import org.geysermc.packgenerator.mappings.GeyserMappings; +import org.geysermc.packgenerator.mapping.geyser.GeyserMappings; +import org.geysermc.packgenerator.pack.attachable.BedrockAttachable; import java.io.IOException; import java.nio.file.Path; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -25,6 +27,7 @@ public class BedrockPack { private final PackManifest manifest; private final GeyserMappings mappings; private final BedrockTextures.Builder itemTextures; + private final List attachables = new ArrayList<>(); public BedrockPack(String name) throws IOException { this.name = name; diff --git a/src/main/java/org/geysermc/packgenerator/pack/BedrockTextures.java b/src/main/java/org/geysermc/packgenerator/pack/BedrockTextures.java index 409e1c2..f118885 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.mapping.GeyserMapping; +import org.geysermc.packgenerator.mapping.geyser.GeyserMapping; import java.util.HashMap; import java.util.List;