diff --git a/gradle.properties b/gradle.properties index 66933cb..c04bfed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ loader_version=0.16.14 # Mod Properties mod_version=0.0.1-1.21.7 maven_group=org.geysermc -archives_base_name=geyser-mappings-generator +archives_base_name=rainbow # Dependencies -fabric_version=0.128.2+1.21.7 +fabric_version=0.129.0+1.21.7 diff --git a/src/main/java/org/geysermc/packgenerator/mapping/animation/BedrockAnimationContext.java b/src/main/java/org/geysermc/packgenerator/mapping/animation/BedrockAnimationContext.java deleted file mode 100644 index 5d06467..0000000 --- a/src/main/java/org/geysermc/packgenerator/mapping/animation/BedrockAnimationContext.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.geysermc.packgenerator.mapping.animation; - -import org.geysermc.packgenerator.pack.animation.BedrockAnimation; - -public record BedrockAnimationContext(BedrockAnimation animation, String firstPerson, String thirdPerson) { -} diff --git a/src/main/java/org/geysermc/packgenerator/CodecUtil.java b/src/main/java/org/geysermc/rainbow/CodecUtil.java similarity index 89% rename from src/main/java/org/geysermc/packgenerator/CodecUtil.java rename to src/main/java/org/geysermc/rainbow/CodecUtil.java index 1a571c1..b72367f 100644 --- a/src/main/java/org/geysermc/packgenerator/CodecUtil.java +++ b/src/main/java/org/geysermc/rainbow/CodecUtil.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator; +package org.geysermc.rainbow; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -47,7 +47,7 @@ public class CodecUtil { JsonElement json = GSON.fromJson(raw, JsonElement.class); return codec.parse(JsonOps.INSTANCE, json).getOrThrow(); } catch (IOException exception) { - GeyserMappingsGenerator.LOGGER.warn("Failed to read JSON file {}!", path, exception); + Rainbow.LOGGER.warn("Failed to read JSON file {}!", path, exception); throw exception; } } @@ -59,7 +59,7 @@ public class CodecUtil { ensureDirectoryExists(path.getParent()); Files.writeString(path, GSON.toJson(json)); } catch (IOException exception) { - GeyserMappingsGenerator.LOGGER.warn("Failed to write file {}!", path, exception); + Rainbow.LOGGER.warn("Failed to write file {}!", path, exception); throw exception; } } @@ -69,7 +69,7 @@ public class CodecUtil { try { Files.createDirectories(directory); } catch (IOException exception) { - GeyserMappingsGenerator.LOGGER.warn("Failed to create directory!", exception); + Rainbow.LOGGER.warn("Failed to create directory!", exception); throw exception; } } diff --git a/src/main/java/org/geysermc/packgenerator/PackConstants.java b/src/main/java/org/geysermc/rainbow/PackConstants.java similarity index 54% rename from src/main/java/org/geysermc/packgenerator/PackConstants.java rename to src/main/java/org/geysermc/rainbow/PackConstants.java index 4d9643a..a6c2a32 100644 --- a/src/main/java/org/geysermc/packgenerator/PackConstants.java +++ b/src/main/java/org/geysermc/rainbow/PackConstants.java @@ -1,8 +1,8 @@ -package org.geysermc.packgenerator; +package org.geysermc.rainbow; -import org.geysermc.packgenerator.pack.BedrockVersion; +import org.geysermc.rainbow.pack.BedrockVersion; public class PackConstants { - public static final String DEFAULT_PACK_DESCRIPTION = "A resourcepack generated by " + GeyserMappingsGenerator.MOD_NAME; + public static final String DEFAULT_PACK_DESCRIPTION = "A resourcepack generated by " + Rainbow.MOD_NAME; public static final BedrockVersion ENGINE_VERSION = BedrockVersion.of(1, 21, 0); } diff --git a/src/main/java/org/geysermc/packgenerator/PackManager.java b/src/main/java/org/geysermc/rainbow/PackManager.java similarity index 92% rename from src/main/java/org/geysermc/packgenerator/PackManager.java rename to src/main/java/org/geysermc/rainbow/PackManager.java index 24e59a0..6708b27 100644 --- a/src/main/java/org/geysermc/packgenerator/PackManager.java +++ b/src/main/java/org/geysermc/rainbow/PackManager.java @@ -1,6 +1,6 @@ -package org.geysermc.packgenerator; +package org.geysermc.rainbow; -import org.geysermc.packgenerator.pack.BedrockPack; +import org.geysermc.rainbow.pack.BedrockPack; import java.io.IOException; import java.util.Optional; diff --git a/src/main/java/org/geysermc/packgenerator/GeyserMappingsGenerator.java b/src/main/java/org/geysermc/rainbow/Rainbow.java similarity index 75% rename from src/main/java/org/geysermc/packgenerator/GeyserMappingsGenerator.java rename to src/main/java/org/geysermc/rainbow/Rainbow.java index 7eb38f7..3ceb730 100644 --- a/src/main/java/org/geysermc/packgenerator/GeyserMappingsGenerator.java +++ b/src/main/java/org/geysermc/rainbow/Rainbow.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator; +package org.geysermc.rainbow; import com.mojang.logging.LogUtils; import net.fabricmc.api.ClientModInitializer; @@ -7,15 +7,15 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.command.v2.ArgumentTypeRegistry; import net.minecraft.commands.synchronization.SingletonArgumentInfo; import net.minecraft.resources.ResourceLocation; -import org.geysermc.packgenerator.command.CommandSuggestionsArgumentType; -import org.geysermc.packgenerator.command.PackGeneratorCommand; -import org.geysermc.packgenerator.mapper.PackMapper; +import org.geysermc.rainbow.command.CommandSuggestionsArgumentType; +import org.geysermc.rainbow.command.PackGeneratorCommand; +import org.geysermc.rainbow.mapper.PackMapper; import org.slf4j.Logger; -public class GeyserMappingsGenerator implements ClientModInitializer { +public class Rainbow implements ClientModInitializer { - public static final String MOD_ID = "geyser-mappings-generator"; - public static final String MOD_NAME = "Geyser Mappings Generator"; + public static final String MOD_ID = "rainbow"; + public static final String MOD_NAME = "Rainbow"; public static final Logger LOGGER = LogUtils.getLogger(); private final PackManager packManager = new PackManager(); diff --git a/src/main/java/org/geysermc/packgenerator/accessor/BlockModelWrapperLocationAccessor.java b/src/main/java/org/geysermc/rainbow/accessor/BlockModelWrapperLocationAccessor.java similarity index 89% rename from src/main/java/org/geysermc/packgenerator/accessor/BlockModelWrapperLocationAccessor.java rename to src/main/java/org/geysermc/rainbow/accessor/BlockModelWrapperLocationAccessor.java index fe0eb13..ed01044 100644 --- a/src/main/java/org/geysermc/packgenerator/accessor/BlockModelWrapperLocationAccessor.java +++ b/src/main/java/org/geysermc/rainbow/accessor/BlockModelWrapperLocationAccessor.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.accessor; +package org.geysermc.rainbow.accessor; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/geysermc/packgenerator/accessor/ResolvedModelAccessor.java b/src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java similarity index 90% rename from src/main/java/org/geysermc/packgenerator/accessor/ResolvedModelAccessor.java rename to src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java index bd26077..ce5c0a5 100644 --- a/src/main/java/org/geysermc/packgenerator/accessor/ResolvedModelAccessor.java +++ b/src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.accessor; +package org.geysermc.rainbow.accessor; import net.minecraft.client.resources.model.ResolvedModel; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/geysermc/packgenerator/accessor/SelectItemModelCasesAccessor.java b/src/main/java/org/geysermc/rainbow/accessor/SelectItemModelCasesAccessor.java similarity index 91% rename from src/main/java/org/geysermc/packgenerator/accessor/SelectItemModelCasesAccessor.java rename to src/main/java/org/geysermc/rainbow/accessor/SelectItemModelCasesAccessor.java index 86ef6fb..79d8cb6 100644 --- a/src/main/java/org/geysermc/packgenerator/accessor/SelectItemModelCasesAccessor.java +++ b/src/main/java/org/geysermc/rainbow/accessor/SelectItemModelCasesAccessor.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.accessor; +package org.geysermc.rainbow.accessor; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import net.minecraft.client.renderer.item.ItemModel; diff --git a/src/main/java/org/geysermc/packgenerator/command/CommandSuggestionsArgumentType.java b/src/main/java/org/geysermc/rainbow/command/CommandSuggestionsArgumentType.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/command/CommandSuggestionsArgumentType.java rename to src/main/java/org/geysermc/rainbow/command/CommandSuggestionsArgumentType.java index eca82bc..f1f812a 100644 --- a/src/main/java/org/geysermc/packgenerator/command/CommandSuggestionsArgumentType.java +++ b/src/main/java/org/geysermc/rainbow/command/CommandSuggestionsArgumentType.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.command; +package org.geysermc.rainbow.command; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; diff --git a/src/main/java/org/geysermc/packgenerator/command/PackGeneratorCommand.java b/src/main/java/org/geysermc/rainbow/command/PackGeneratorCommand.java similarity index 95% rename from src/main/java/org/geysermc/packgenerator/command/PackGeneratorCommand.java rename to src/main/java/org/geysermc/rainbow/command/PackGeneratorCommand.java index 4af026a..045cbd5 100644 --- a/src/main/java/org/geysermc/packgenerator/command/PackGeneratorCommand.java +++ b/src/main/java/org/geysermc/rainbow/command/PackGeneratorCommand.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.command; +package org.geysermc.rainbow.command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -10,10 +10,10 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; -import org.geysermc.packgenerator.PackManager; -import org.geysermc.packgenerator.mapper.InventoryMapper; -import org.geysermc.packgenerator.mapper.ItemSuggestionProvider; -import org.geysermc.packgenerator.mapper.PackMapper; +import org.geysermc.rainbow.PackManager; +import org.geysermc.rainbow.mapper.InventoryMapper; +import org.geysermc.rainbow.mapper.ItemSuggestionProvider; +import org.geysermc.rainbow.mapper.PackMapper; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -22,7 +22,7 @@ import java.util.function.Consumer; public class PackGeneratorCommand { public static void register(CommandDispatcher dispatcher, PackManager packManager, PackMapper packMapper) { - dispatcher.register(ClientCommandManager.literal("packgenerator") + dispatcher.register(ClientCommandManager.literal("rainbow") .then(ClientCommandManager.literal("create") .then(ClientCommandManager.argument("name", StringArgumentType.word()) .executes(context -> { diff --git a/src/main/java/org/geysermc/packgenerator/mapper/CustomItemProvider.java b/src/main/java/org/geysermc/rainbow/mapper/CustomItemProvider.java similarity index 88% rename from src/main/java/org/geysermc/packgenerator/mapper/CustomItemProvider.java rename to src/main/java/org/geysermc/rainbow/mapper/CustomItemProvider.java index 4262803..8a8c7ad 100644 --- a/src/main/java/org/geysermc/packgenerator/mapper/CustomItemProvider.java +++ b/src/main/java/org/geysermc/rainbow/mapper/CustomItemProvider.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapper; +package org.geysermc.rainbow.mapper; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/org/geysermc/packgenerator/mapper/InventoryMapper.java b/src/main/java/org/geysermc/rainbow/mapper/InventoryMapper.java similarity index 93% rename from src/main/java/org/geysermc/packgenerator/mapper/InventoryMapper.java rename to src/main/java/org/geysermc/rainbow/mapper/InventoryMapper.java index 80045e7..5cfde28 100644 --- a/src/main/java/org/geysermc/packgenerator/mapper/InventoryMapper.java +++ b/src/main/java/org/geysermc/rainbow/mapper/InventoryMapper.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapper; +package org.geysermc.rainbow.mapper; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/org/geysermc/packgenerator/mapper/ItemSuggestionProvider.java b/src/main/java/org/geysermc/rainbow/mapper/ItemSuggestionProvider.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/mapper/ItemSuggestionProvider.java rename to src/main/java/org/geysermc/rainbow/mapper/ItemSuggestionProvider.java index b69b8fd..fea136a 100644 --- a/src/main/java/org/geysermc/packgenerator/mapper/ItemSuggestionProvider.java +++ b/src/main/java/org/geysermc/rainbow/mapper/ItemSuggestionProvider.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapper; +package org.geysermc.rainbow.mapper; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.player.LocalPlayer; diff --git a/src/main/java/org/geysermc/packgenerator/mapper/PackMapper.java b/src/main/java/org/geysermc/rainbow/mapper/PackMapper.java similarity index 94% rename from src/main/java/org/geysermc/packgenerator/mapper/PackMapper.java rename to src/main/java/org/geysermc/rainbow/mapper/PackMapper.java index 63e15cf..51d4299 100644 --- a/src/main/java/org/geysermc/packgenerator/mapper/PackMapper.java +++ b/src/main/java/org/geysermc/rainbow/mapper/PackMapper.java @@ -1,10 +1,10 @@ -package org.geysermc.packgenerator.mapper; +package org.geysermc.rainbow.mapper; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.player.LocalPlayer; import net.minecraft.network.chat.Component; -import org.geysermc.packgenerator.PackManager; +import org.geysermc.rainbow.PackManager; import java.util.Objects; import java.util.Optional; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/BedrockItemConsumer.java b/src/main/java/org/geysermc/rainbow/mapping/BedrockItemConsumer.java similarity index 51% rename from src/main/java/org/geysermc/packgenerator/mapping/BedrockItemConsumer.java rename to src/main/java/org/geysermc/rainbow/mapping/BedrockItemConsumer.java index 746b441..784051f 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/BedrockItemConsumer.java +++ b/src/main/java/org/geysermc/rainbow/mapping/BedrockItemConsumer.java @@ -1,6 +1,6 @@ -package org.geysermc.packgenerator.mapping; +package org.geysermc.rainbow.mapping; -import org.geysermc.packgenerator.pack.BedrockItem; +import org.geysermc.rainbow.pack.BedrockItem; @FunctionalInterface public interface BedrockItemConsumer { diff --git a/src/main/java/org/geysermc/packgenerator/mapping/BedrockItemMapper.java b/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java similarity index 90% rename from src/main/java/org/geysermc/packgenerator/mapping/BedrockItemMapper.java rename to src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java index 6a48d68..c254773 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/BedrockItemMapper.java +++ b/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping; +package org.geysermc.rainbow.mapping; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import net.minecraft.client.Minecraft; @@ -28,24 +28,24 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; 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.ResolvedModelAccessor; -import org.geysermc.packgenerator.accessor.SelectItemModelCasesAccessor; -import org.geysermc.packgenerator.mapping.animation.AnimationMapper; -import org.geysermc.packgenerator.mapping.animation.BedrockAnimationContext; -import org.geysermc.packgenerator.mapping.attachable.AttachableMapper; -import org.geysermc.packgenerator.mapping.geometry.BedrockGeometryContext; -import org.geysermc.packgenerator.mapping.geometry.GeometryMapper; -import org.geysermc.packgenerator.mapping.geometry.GeometryRenderer; -import org.geysermc.packgenerator.mapping.geyser.GeyserMappings; -import org.geysermc.packgenerator.mapping.geyser.GeyserSingleDefinition; -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; -import org.geysermc.packgenerator.pack.BedrockItem; -import org.geysermc.packgenerator.pack.BedrockTextures; +import org.geysermc.rainbow.accessor.BlockModelWrapperLocationAccessor; +import org.geysermc.rainbow.accessor.ResolvedModelAccessor; +import org.geysermc.rainbow.accessor.SelectItemModelCasesAccessor; +import org.geysermc.rainbow.mapping.animation.AnimationMapper; +import org.geysermc.rainbow.mapping.animation.BedrockAnimationContext; +import org.geysermc.rainbow.mapping.attachable.AttachableMapper; +import org.geysermc.rainbow.mapping.geometry.BedrockGeometryContext; +import org.geysermc.rainbow.mapping.geometry.GeometryMapper; +import org.geysermc.rainbow.mapping.geometry.GeometryRenderer; +import org.geysermc.rainbow.mapping.geyser.GeyserMappings; +import org.geysermc.rainbow.mapping.geyser.GeyserSingleDefinition; +import org.geysermc.rainbow.mapping.geyser.predicate.GeyserConditionPredicate; +import org.geysermc.rainbow.mapping.geyser.predicate.GeyserMatchPredicate; +import org.geysermc.rainbow.mapping.geyser.predicate.GeyserPredicate; +import org.geysermc.rainbow.mixin.ConditionalItemModelAccessor; +import org.geysermc.rainbow.mixin.SelectItemModelAccessor; +import org.geysermc.rainbow.pack.BedrockItem; +import org.geysermc.rainbow.pack.BedrockTextures; import java.nio.file.Path; import java.util.List; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/animation/AnimationMapper.java b/src/main/java/org/geysermc/rainbow/mapping/animation/AnimationMapper.java similarity index 95% rename from src/main/java/org/geysermc/packgenerator/mapping/animation/AnimationMapper.java rename to src/main/java/org/geysermc/rainbow/mapping/animation/AnimationMapper.java index ab9df14..3901502 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/animation/AnimationMapper.java +++ b/src/main/java/org/geysermc/rainbow/mapping/animation/AnimationMapper.java @@ -1,8 +1,8 @@ -package org.geysermc.packgenerator.mapping.animation; +package org.geysermc.rainbow.mapping.animation; import net.minecraft.client.renderer.block.model.ItemTransform; import net.minecraft.client.renderer.block.model.ItemTransforms; -import org.geysermc.packgenerator.pack.animation.BedrockAnimation; +import org.geysermc.rainbow.pack.animation.BedrockAnimation; import org.joml.Vector3f; import org.joml.Vector3fc; diff --git a/src/main/java/org/geysermc/rainbow/mapping/animation/BedrockAnimationContext.java b/src/main/java/org/geysermc/rainbow/mapping/animation/BedrockAnimationContext.java new file mode 100644 index 0000000..553836c --- /dev/null +++ b/src/main/java/org/geysermc/rainbow/mapping/animation/BedrockAnimationContext.java @@ -0,0 +1,6 @@ +package org.geysermc.rainbow.mapping.animation; + +import org.geysermc.rainbow.pack.animation.BedrockAnimation; + +public record BedrockAnimationContext(BedrockAnimation animation, String firstPerson, String thirdPerson) { +} diff --git a/src/main/java/org/geysermc/packgenerator/mapping/attachable/AttachableMapper.java b/src/main/java/org/geysermc/rainbow/mapping/attachable/AttachableMapper.java similarity index 91% rename from src/main/java/org/geysermc/packgenerator/mapping/attachable/AttachableMapper.java rename to src/main/java/org/geysermc/rainbow/mapping/attachable/AttachableMapper.java index 1bb6dc1..6995474 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/attachable/AttachableMapper.java +++ b/src/main/java/org/geysermc/rainbow/mapping/attachable/AttachableMapper.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.attachable; +package org.geysermc.rainbow.mapping.attachable; import com.mojang.datafixers.util.Pair; import net.minecraft.client.Minecraft; @@ -9,10 +9,10 @@ import net.minecraft.core.component.DataComponents; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.equipment.Equippable; -import org.geysermc.packgenerator.mapping.animation.BedrockAnimationContext; -import org.geysermc.packgenerator.mapping.geometry.BedrockGeometryContext; -import org.geysermc.packgenerator.mixin.EntityRenderDispatcherAccessor; -import org.geysermc.packgenerator.pack.attachable.BedrockAttachable; +import org.geysermc.rainbow.mapping.animation.BedrockAnimationContext; +import org.geysermc.rainbow.mapping.geometry.BedrockGeometryContext; +import org.geysermc.rainbow.mixin.EntityRenderDispatcherAccessor; +import org.geysermc.rainbow.pack.attachable.BedrockAttachable; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geometry/BedrockGeometryContext.java b/src/main/java/org/geysermc/rainbow/mapping/geometry/BedrockGeometryContext.java similarity index 54% rename from src/main/java/org/geysermc/packgenerator/mapping/geometry/BedrockGeometryContext.java rename to src/main/java/org/geysermc/rainbow/mapping/geometry/BedrockGeometryContext.java index aaa0fd6..2e26ac2 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geometry/BedrockGeometryContext.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geometry/BedrockGeometryContext.java @@ -1,6 +1,6 @@ -package org.geysermc.packgenerator.mapping.geometry; +package org.geysermc.rainbow.mapping.geometry; import net.minecraft.resources.ResourceLocation; -import org.geysermc.packgenerator.pack.geometry.BedrockGeometry; +import org.geysermc.rainbow.pack.geometry.BedrockGeometry; public record BedrockGeometryContext(BedrockGeometry geometry, ResourceLocation texture) {} diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geometry/GeometryMapper.java b/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryMapper.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/mapping/geometry/GeometryMapper.java rename to src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryMapper.java index 58b0912..27fa5f0 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geometry/GeometryMapper.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryMapper.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.geometry; +package org.geysermc.rainbow.mapping.geometry; import net.minecraft.client.renderer.block.model.BlockElement; import net.minecraft.client.renderer.block.model.BlockElementFace; @@ -7,7 +7,7 @@ import net.minecraft.client.renderer.block.model.SimpleUnbakedGeometry; import net.minecraft.client.resources.model.ResolvedModel; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; -import org.geysermc.packgenerator.pack.geometry.BedrockGeometry; +import org.geysermc.rainbow.pack.geometry.BedrockGeometry; import org.joml.Vector2f; import org.joml.Vector3f; import org.joml.Vector3fc; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geometry/GeometryRenderer.java b/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryRenderer.java similarity index 94% rename from src/main/java/org/geysermc/packgenerator/mapping/geometry/GeometryRenderer.java rename to src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryRenderer.java index 3cf598a..99432bf 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geometry/GeometryRenderer.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryRenderer.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.geometry; +package org.geysermc.rainbow.mapping.geometry; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.platform.NativeImage; @@ -14,9 +14,9 @@ import net.minecraft.client.gui.render.state.pip.OversizedItemRenderState; import net.minecraft.client.renderer.item.TrackingItemStackRenderState; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import org.geysermc.packgenerator.CodecUtil; -import org.geysermc.packgenerator.mixin.PictureInPictureRendererAccessor; -import org.geysermc.packgenerator.render.PictureInPictureCopyRenderer; +import org.geysermc.rainbow.CodecUtil; +import org.geysermc.rainbow.mixin.PictureInPictureRendererAccessor; +import org.geysermc.rainbow.render.PictureInPictureCopyRenderer; import org.joml.Matrix3x2fStack; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserGroupDefinition.java b/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserGroupDefinition.java rename to src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java index 8bd6766..427d94b 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserGroupDefinition.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.geyser; +package org.geysermc.rainbow.mapping.geyser; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMapping.java b/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java similarity index 96% rename from src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMapping.java rename to src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java index 902d081..56f606d 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMapping.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.geyser; +package org.geysermc.rainbow.mapping.geyser; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMappings.java b/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMappings.java rename to src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java index 6762803..064a3e9 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserMappings.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.geyser; +package org.geysermc.rainbow.mapping.geyser; import com.google.common.collect.Multimap; import com.google.common.collect.MultimapBuilder; @@ -7,7 +7,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.Holder; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; -import org.geysermc.packgenerator.CodecUtil; +import org.geysermc.rainbow.CodecUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserSingleDefinition.java b/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserSingleDefinition.java rename to src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java index 65cca44..ae2da37 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geyser/GeyserSingleDefinition.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.geyser; +package org.geysermc.rainbow.mapping.geyser; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; @@ -7,7 +7,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.geyser.predicate.GeyserPredicate; +import org.geysermc.rainbow.mapping.geyser.predicate.GeyserPredicate; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserConditionPredicate.java b/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserConditionPredicate.java rename to src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java index b46d6ce..1258a7c 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserConditionPredicate.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.geyser.predicate; +package org.geysermc.rainbow.mapping.geyser.predicate; import com.google.common.base.Suppliers; import com.mojang.serialization.Codec; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserMatchPredicate.java b/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserMatchPredicate.java rename to src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java index dba7cba..ecd558c 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserMatchPredicate.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.geyser.predicate; +package org.geysermc.rainbow.mapping.geyser.predicate; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserPredicate.java b/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java similarity index 95% rename from src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserPredicate.java rename to src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java index fee35bb..9d941fb 100644 --- a/src/main/java/org/geysermc/packgenerator/mapping/geyser/predicate/GeyserPredicate.java +++ b/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mapping.geyser.predicate; +package org.geysermc.rainbow.mapping.geyser.predicate; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/BlockModelWrapperMixin.java b/src/main/java/org/geysermc/rainbow/mixin/BlockModelWrapperMixin.java similarity index 92% rename from src/main/java/org/geysermc/packgenerator/mixin/BlockModelWrapperMixin.java rename to src/main/java/org/geysermc/rainbow/mixin/BlockModelWrapperMixin.java index 4bb67ca..6e9a1e0 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/BlockModelWrapperMixin.java +++ b/src/main/java/org/geysermc/rainbow/mixin/BlockModelWrapperMixin.java @@ -1,9 +1,9 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import net.minecraft.client.renderer.item.BlockModelWrapper; import net.minecraft.client.renderer.item.ItemModel; import net.minecraft.resources.ResourceLocation; -import org.geysermc.packgenerator.accessor.BlockModelWrapperLocationAccessor; +import org.geysermc.rainbow.accessor.BlockModelWrapperLocationAccessor; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/ConditionalItemModelAccessor.java b/src/main/java/org/geysermc/rainbow/mixin/ConditionalItemModelAccessor.java similarity index 92% rename from src/main/java/org/geysermc/packgenerator/mixin/ConditionalItemModelAccessor.java rename to src/main/java/org/geysermc/rainbow/mixin/ConditionalItemModelAccessor.java index 899e95c..7560640 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/ConditionalItemModelAccessor.java +++ b/src/main/java/org/geysermc/rainbow/mixin/ConditionalItemModelAccessor.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import net.minecraft.client.renderer.item.ConditionalItemModel; import net.minecraft.client.renderer.item.ItemModel; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/EntityRenderDispatcherAccessor.java b/src/main/java/org/geysermc/rainbow/mixin/EntityRenderDispatcherAccessor.java similarity index 90% rename from src/main/java/org/geysermc/packgenerator/mixin/EntityRenderDispatcherAccessor.java rename to src/main/java/org/geysermc/rainbow/mixin/EntityRenderDispatcherAccessor.java index 1168069..6dcc361 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/EntityRenderDispatcherAccessor.java +++ b/src/main/java/org/geysermc/rainbow/mixin/EntityRenderDispatcherAccessor.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import net.minecraft.client.renderer.entity.EntityRenderDispatcher; import net.minecraft.client.resources.model.EquipmentAssetManager; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/GuiItemRenderStateMixin.java b/src/main/java/org/geysermc/rainbow/mixin/GuiItemRenderStateMixin.java similarity index 92% rename from src/main/java/org/geysermc/packgenerator/mixin/GuiItemRenderStateMixin.java rename to src/main/java/org/geysermc/rainbow/mixin/GuiItemRenderStateMixin.java index d75d476..70e1b9d 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/GuiItemRenderStateMixin.java +++ b/src/main/java/org/geysermc/rainbow/mixin/GuiItemRenderStateMixin.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import net.minecraft.client.gui.render.state.GuiItemRenderState; import net.minecraft.client.gui.render.state.ScreenArea; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/ModelManagerMixin.java b/src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java similarity index 95% rename from src/main/java/org/geysermc/packgenerator/mixin/ModelManagerMixin.java rename to src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java index 78e2e43..138b9c4 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/ModelManagerMixin.java +++ b/src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; @@ -7,7 +7,7 @@ import net.minecraft.client.resources.model.ModelManager; import net.minecraft.client.resources.model.ResolvedModel; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.PreparableReloadListener; -import org.geysermc.packgenerator.accessor.ResolvedModelAccessor; +import org.geysermc.rainbow.accessor.ResolvedModelAccessor; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/PictureInPictureRendererAccessor.java b/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererAccessor.java similarity index 89% rename from src/main/java/org/geysermc/packgenerator/mixin/PictureInPictureRendererAccessor.java rename to src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererAccessor.java index 39aa091..4c6d5e4 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/PictureInPictureRendererAccessor.java +++ b/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererAccessor.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import com.mojang.blaze3d.textures.GpuTexture; import net.minecraft.client.gui.render.pip.PictureInPictureRenderer; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/PictureInPictureRendererMixin.java b/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererMixin.java similarity index 90% rename from src/main/java/org/geysermc/packgenerator/mixin/PictureInPictureRendererMixin.java rename to src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererMixin.java index 342f54e..ecf4df5 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/PictureInPictureRendererMixin.java +++ b/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererMixin.java @@ -1,8 +1,8 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import com.mojang.blaze3d.textures.GpuTexture; import net.minecraft.client.gui.render.pip.PictureInPictureRenderer; -import org.geysermc.packgenerator.render.PictureInPictureCopyRenderer; +import org.geysermc.rainbow.render.PictureInPictureCopyRenderer; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/SelectItemModelAccessor.java b/src/main/java/org/geysermc/rainbow/mixin/SelectItemModelAccessor.java similarity index 89% rename from src/main/java/org/geysermc/packgenerator/mixin/SelectItemModelAccessor.java rename to src/main/java/org/geysermc/rainbow/mixin/SelectItemModelAccessor.java index ae88ad4..5b833f6 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/SelectItemModelAccessor.java +++ b/src/main/java/org/geysermc/rainbow/mixin/SelectItemModelAccessor.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import net.minecraft.client.renderer.item.SelectItemModel; import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/SelectItemModelMixin.java b/src/main/java/org/geysermc/rainbow/mixin/SelectItemModelMixin.java similarity index 93% rename from src/main/java/org/geysermc/packgenerator/mixin/SelectItemModelMixin.java rename to src/main/java/org/geysermc/rainbow/mixin/SelectItemModelMixin.java index 2e36ffc..4e848bd 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/SelectItemModelMixin.java +++ b/src/main/java/org/geysermc/rainbow/mixin/SelectItemModelMixin.java @@ -1,11 +1,11 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import com.llamalad7.mixinextras.sugar.Local; import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import net.minecraft.client.renderer.item.ItemModel; import net.minecraft.client.renderer.item.SelectItemModel; import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty; -import org.geysermc.packgenerator.accessor.SelectItemModelCasesAccessor; +import org.geysermc.rainbow.accessor.SelectItemModelCasesAccessor; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/org/geysermc/packgenerator/mixin/SplashRendererAccessor.java b/src/main/java/org/geysermc/rainbow/mixin/SplashRendererAccessor.java similarity index 86% rename from src/main/java/org/geysermc/packgenerator/mixin/SplashRendererAccessor.java rename to src/main/java/org/geysermc/rainbow/mixin/SplashRendererAccessor.java index 4a23c40..95fcb8e 100644 --- a/src/main/java/org/geysermc/packgenerator/mixin/SplashRendererAccessor.java +++ b/src/main/java/org/geysermc/rainbow/mixin/SplashRendererAccessor.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.mixin; +package org.geysermc.rainbow.mixin; import net.minecraft.client.gui.components.SplashRenderer; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/geysermc/packgenerator/pack/BedrockItem.java b/src/main/java/org/geysermc/rainbow/pack/BedrockItem.java similarity index 74% rename from src/main/java/org/geysermc/packgenerator/pack/BedrockItem.java rename to src/main/java/org/geysermc/rainbow/pack/BedrockItem.java index 112b2b4..9a0e141 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/BedrockItem.java +++ b/src/main/java/org/geysermc/rainbow/pack/BedrockItem.java @@ -1,10 +1,10 @@ -package org.geysermc.packgenerator.pack; +package org.geysermc.rainbow.pack; import net.minecraft.resources.ResourceLocation; -import org.geysermc.packgenerator.mapping.geyser.GeyserSingleDefinition; -import org.geysermc.packgenerator.pack.animation.BedrockAnimation; -import org.geysermc.packgenerator.pack.attachable.BedrockAttachable; -import org.geysermc.packgenerator.pack.geometry.BedrockGeometry; +import org.geysermc.rainbow.mapping.geyser.GeyserSingleDefinition; +import org.geysermc.rainbow.pack.animation.BedrockAnimation; +import org.geysermc.rainbow.pack.attachable.BedrockAttachable; +import org.geysermc.rainbow.pack.geometry.BedrockGeometry; import java.io.IOException; import java.nio.file.Path; diff --git a/src/main/java/org/geysermc/packgenerator/pack/BedrockPack.java b/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java similarity index 95% rename from src/main/java/org/geysermc/packgenerator/pack/BedrockPack.java rename to src/main/java/org/geysermc/rainbow/pack/BedrockPack.java index 5bf76d6..9cc0665 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/BedrockPack.java +++ b/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.pack; +package org.geysermc.rainbow.pack; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.Minecraft; @@ -8,11 +8,11 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ProblemReporter; import net.minecraft.world.item.ItemStack; import org.apache.commons.io.IOUtils; -import org.geysermc.packgenerator.CodecUtil; -import org.geysermc.packgenerator.PackConstants; -import org.geysermc.packgenerator.mapping.BedrockItemMapper; -import org.geysermc.packgenerator.mapping.geyser.GeyserMappings; -import org.geysermc.packgenerator.mixin.SplashRendererAccessor; +import org.geysermc.rainbow.CodecUtil; +import org.geysermc.rainbow.PackConstants; +import org.geysermc.rainbow.mapping.BedrockItemMapper; +import org.geysermc.rainbow.mapping.geyser.GeyserMappings; +import org.geysermc.rainbow.mixin.SplashRendererAccessor; import org.jetbrains.annotations.NotNull; import java.io.FileOutputStream; @@ -29,7 +29,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; public class BedrockPack { - private static final Path EXPORT_DIRECTORY = FabricLoader.getInstance().getGameDir().resolve("geyser"); + private static final Path EXPORT_DIRECTORY = FabricLoader.getInstance().getGameDir().resolve("rainbow"); private static final Path PACK_DIRECTORY = Path.of("pack"); private static final Path ATTACHABLES_DIRECTORY = Path.of("attachables"); private static final Path GEOMETRY_DIRECTORY = Path.of("models/entity"); diff --git a/src/main/java/org/geysermc/packgenerator/pack/BedrockTextureAtlas.java b/src/main/java/org/geysermc/rainbow/pack/BedrockTextureAtlas.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/pack/BedrockTextureAtlas.java rename to src/main/java/org/geysermc/rainbow/pack/BedrockTextureAtlas.java index 686a18f..ee99ab7 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/BedrockTextureAtlas.java +++ b/src/main/java/org/geysermc/rainbow/pack/BedrockTextureAtlas.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.pack; +package org.geysermc.rainbow.pack; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; diff --git a/src/main/java/org/geysermc/packgenerator/pack/BedrockTextures.java b/src/main/java/org/geysermc/rainbow/pack/BedrockTextures.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/pack/BedrockTextures.java rename to src/main/java/org/geysermc/rainbow/pack/BedrockTextures.java index 1437d3c..030da51 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/BedrockTextures.java +++ b/src/main/java/org/geysermc/rainbow/pack/BedrockTextures.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.pack; +package org.geysermc.rainbow.pack; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Codec; diff --git a/src/main/java/org/geysermc/packgenerator/pack/BedrockVersion.java b/src/main/java/org/geysermc/rainbow/pack/BedrockVersion.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/pack/BedrockVersion.java rename to src/main/java/org/geysermc/rainbow/pack/BedrockVersion.java index b4666c3..92b4623 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/BedrockVersion.java +++ b/src/main/java/org/geysermc/rainbow/pack/BedrockVersion.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.pack; +package org.geysermc.rainbow.pack; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; diff --git a/src/main/java/org/geysermc/packgenerator/pack/PackManifest.java b/src/main/java/org/geysermc/rainbow/pack/PackManifest.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/pack/PackManifest.java rename to src/main/java/org/geysermc/rainbow/pack/PackManifest.java index b218d77..456dc52 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/PackManifest.java +++ b/src/main/java/org/geysermc/rainbow/pack/PackManifest.java @@ -1,10 +1,10 @@ -package org.geysermc.packgenerator.pack; +package org.geysermc.rainbow.pack; import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.UUIDUtil; -import org.geysermc.packgenerator.CodecUtil; +import org.geysermc.rainbow.CodecUtil; import java.util.List; import java.util.UUID; diff --git a/src/main/java/org/geysermc/packgenerator/pack/animation/BedrockAnimation.java b/src/main/java/org/geysermc/rainbow/pack/animation/BedrockAnimation.java similarity index 97% rename from src/main/java/org/geysermc/packgenerator/pack/animation/BedrockAnimation.java rename to src/main/java/org/geysermc/rainbow/pack/animation/BedrockAnimation.java index 2433f7d..dbdf1fc 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/animation/BedrockAnimation.java +++ b/src/main/java/org/geysermc/rainbow/pack/animation/BedrockAnimation.java @@ -1,11 +1,11 @@ -package org.geysermc.packgenerator.pack.animation; +package org.geysermc.rainbow.pack.animation; import com.mojang.datafixers.util.Either; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; import com.mojang.serialization.codecs.RecordCodecBuilder; -import org.geysermc.packgenerator.CodecUtil; -import org.geysermc.packgenerator.pack.BedrockVersion; +import org.geysermc.rainbow.CodecUtil; +import org.geysermc.rainbow.pack.BedrockVersion; import org.joml.Vector3fc; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packgenerator/pack/attachable/BedrockAttachable.java b/src/main/java/org/geysermc/rainbow/pack/attachable/BedrockAttachable.java similarity index 96% rename from src/main/java/org/geysermc/packgenerator/pack/attachable/BedrockAttachable.java rename to src/main/java/org/geysermc/rainbow/pack/attachable/BedrockAttachable.java index bdaf6d7..3dddea4 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/attachable/BedrockAttachable.java +++ b/src/main/java/org/geysermc/rainbow/pack/attachable/BedrockAttachable.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.pack.attachable; +package org.geysermc.rainbow.pack.attachable; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Codec; @@ -9,12 +9,12 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ExtraCodecs; import net.minecraft.util.StringRepresentable; import net.minecraft.world.entity.EquipmentSlot; -import org.geysermc.packgenerator.CodecUtil; -import org.geysermc.packgenerator.PackConstants; -import org.geysermc.packgenerator.mapping.geyser.GeyserSingleDefinition; -import org.geysermc.packgenerator.pack.BedrockTextures; -import org.geysermc.packgenerator.pack.BedrockVersion; -import org.geysermc.packgenerator.pack.geometry.BedrockGeometry; +import org.geysermc.rainbow.CodecUtil; +import org.geysermc.rainbow.PackConstants; +import org.geysermc.rainbow.mapping.geyser.GeyserSingleDefinition; +import org.geysermc.rainbow.pack.BedrockTextures; +import org.geysermc.rainbow.pack.BedrockVersion; +import org.geysermc.rainbow.pack.geometry.BedrockGeometry; import org.jetbrains.annotations.NotNull; import java.io.IOException; diff --git a/src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaGeometries.java b/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaGeometries.java similarity index 92% rename from src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaGeometries.java rename to src/main/java/org/geysermc/rainbow/pack/attachable/VanillaGeometries.java index 19a6970..0f2e38f 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaGeometries.java +++ b/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaGeometries.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.pack.attachable; +package org.geysermc.rainbow.pack.attachable; import net.minecraft.world.entity.EquipmentSlot; diff --git a/src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaMaterials.java b/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaMaterials.java similarity index 84% rename from src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaMaterials.java rename to src/main/java/org/geysermc/rainbow/pack/attachable/VanillaMaterials.java index 4291d29..88af42d 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaMaterials.java +++ b/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaMaterials.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.pack.attachable; +package org.geysermc.rainbow.pack.attachable; public class VanillaMaterials { public static final String ARMOR = "armor"; diff --git a/src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaRenderControllers.java b/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaRenderControllers.java similarity index 78% rename from src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaRenderControllers.java rename to src/main/java/org/geysermc/rainbow/pack/attachable/VanillaRenderControllers.java index aa92175..5bad88b 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaRenderControllers.java +++ b/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaRenderControllers.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.pack.attachable; +package org.geysermc.rainbow.pack.attachable; public class VanillaRenderControllers { public static final String ARMOR = "controller.render.armor"; diff --git a/src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaTextures.java b/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaTextures.java similarity index 79% rename from src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaTextures.java rename to src/main/java/org/geysermc/rainbow/pack/attachable/VanillaTextures.java index 5062ce3..23b1ea0 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/attachable/VanillaTextures.java +++ b/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaTextures.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.pack.attachable; +package org.geysermc.rainbow.pack.attachable; public class VanillaTextures { public static final String ENCHANTED_ACTOR_GLINT = "misc/enchanted_actor_glint"; diff --git a/src/main/java/org/geysermc/packgenerator/pack/geometry/BedrockGeometry.java b/src/main/java/org/geysermc/rainbow/pack/geometry/BedrockGeometry.java similarity index 98% rename from src/main/java/org/geysermc/packgenerator/pack/geometry/BedrockGeometry.java rename to src/main/java/org/geysermc/rainbow/pack/geometry/BedrockGeometry.java index 6c053bf..993abe0 100644 --- a/src/main/java/org/geysermc/packgenerator/pack/geometry/BedrockGeometry.java +++ b/src/main/java/org/geysermc/rainbow/pack/geometry/BedrockGeometry.java @@ -1,11 +1,11 @@ -package org.geysermc.packgenerator.pack.geometry; +package org.geysermc.rainbow.pack.geometry; import com.mojang.math.Quadrant; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.Direction; -import org.geysermc.packgenerator.CodecUtil; -import org.geysermc.packgenerator.pack.BedrockVersion; +import org.geysermc.rainbow.CodecUtil; +import org.geysermc.rainbow.pack.BedrockVersion; import org.joml.Vector2fc; import org.joml.Vector3f; import org.joml.Vector3fc; diff --git a/src/main/java/org/geysermc/packgenerator/render/PictureInPictureCopyRenderer.java b/src/main/java/org/geysermc/rainbow/render/PictureInPictureCopyRenderer.java similarity index 71% rename from src/main/java/org/geysermc/packgenerator/render/PictureInPictureCopyRenderer.java rename to src/main/java/org/geysermc/rainbow/render/PictureInPictureCopyRenderer.java index 6a2bef6..c01bfcb 100644 --- a/src/main/java/org/geysermc/packgenerator/render/PictureInPictureCopyRenderer.java +++ b/src/main/java/org/geysermc/rainbow/render/PictureInPictureCopyRenderer.java @@ -1,4 +1,4 @@ -package org.geysermc.packgenerator.render; +package org.geysermc.rainbow.render; public interface PictureInPictureCopyRenderer { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index edc2ceb..7361804 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,29 +1,29 @@ { "schemaVersion": 1, - "id": "geyser-mappings-generator", + "id": "rainbow", "version": "${version}", - "name": "Geyser Mappings Generator", - "description": "A mod to generate Geyser mappings (and potentially in the future, full bedrock packs) for use with Geyser's custom item API (v2).", + "name": "Rainbow", + "description": "Rainbow is a mod to generate Geyser mappings and bedrock resourcepacks for use with Geyser's custom item API (v2)", "authors": [ "GeyserMC contributors" ], "contact": { - "repo": "https://github.com/GeyserMC/geyser-mappings-generator" + "repo": "https://github.com/GeyserMC/rainbow" }, "license": "MIT", - "icon": "assets/geyser-mappings-generator/icon.png", + "icon": "assets/rainbow/icon.png", "environment": "client", "entrypoints": { "client": [ - "org.geysermc.packgenerator.GeyserMappingsGenerator" + "org.geysermc.rainbow.Rainbow" ] }, "mixins": [ - "geyser-mappings-generator.mixins.json" + "rainbow.mixins.json" ], "depends": { "fabricloader": ">=${loader_version}", - "fabric": "*", + "fabric-api": "*", "minecraft": "${minecraft_version}" } } diff --git a/src/main/resources/geyser-mappings-generator.mixins.json b/src/main/resources/rainbow.mixins.json similarity index 92% rename from src/main/resources/geyser-mappings-generator.mixins.json rename to src/main/resources/rainbow.mixins.json index de34904..b31361f 100644 --- a/src/main/resources/geyser-mappings-generator.mixins.json +++ b/src/main/resources/rainbow.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "org.geysermc.packgenerator.mixin", + "package": "org.geysermc.rainbow.mixin", "compatibilityLevel": "JAVA_21", "mixins": [], "client": [