1
0
mirror of https://github.com/GeyserMC/Rainbow.git synced 2025-12-19 14:59:16 +00:00

geyser-mappings-generator -> rainbow

This commit is contained in:
Eclipse
2025-07-17 07:44:38 +00:00
parent 4449cd95ff
commit 23c40c92ad
56 changed files with 142 additions and 142 deletions

View File

@@ -8,7 +8,7 @@ loader_version=0.16.14
# Mod Properties # Mod Properties
mod_version=0.0.1-1.21.7 mod_version=0.0.1-1.21.7
maven_group=org.geysermc maven_group=org.geysermc
archives_base_name=geyser-mappings-generator archives_base_name=rainbow
# Dependencies # Dependencies
fabric_version=0.128.2+1.21.7 fabric_version=0.129.0+1.21.7

View File

@@ -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) {
}

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator; package org.geysermc.rainbow;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@@ -47,7 +47,7 @@ public class CodecUtil {
JsonElement json = GSON.fromJson(raw, JsonElement.class); JsonElement json = GSON.fromJson(raw, JsonElement.class);
return codec.parse(JsonOps.INSTANCE, json).getOrThrow(); return codec.parse(JsonOps.INSTANCE, json).getOrThrow();
} catch (IOException exception) { } 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; throw exception;
} }
} }
@@ -59,7 +59,7 @@ public class CodecUtil {
ensureDirectoryExists(path.getParent()); ensureDirectoryExists(path.getParent());
Files.writeString(path, GSON.toJson(json)); Files.writeString(path, GSON.toJson(json));
} catch (IOException exception) { } catch (IOException exception) {
GeyserMappingsGenerator.LOGGER.warn("Failed to write file {}!", path, exception); Rainbow.LOGGER.warn("Failed to write file {}!", path, exception);
throw exception; throw exception;
} }
} }
@@ -69,7 +69,7 @@ public class CodecUtil {
try { try {
Files.createDirectories(directory); Files.createDirectories(directory);
} catch (IOException exception) { } catch (IOException exception) {
GeyserMappingsGenerator.LOGGER.warn("Failed to create directory!", exception); Rainbow.LOGGER.warn("Failed to create directory!", exception);
throw exception; throw exception;
} }
} }

View File

@@ -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 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); public static final BedrockVersion ENGINE_VERSION = BedrockVersion.of(1, 21, 0);
} }

View File

@@ -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.io.IOException;
import java.util.Optional; import java.util.Optional;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator; package org.geysermc.rainbow;
import com.mojang.logging.LogUtils; import com.mojang.logging.LogUtils;
import net.fabricmc.api.ClientModInitializer; 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.fabricmc.fabric.api.command.v2.ArgumentTypeRegistry;
import net.minecraft.commands.synchronization.SingletonArgumentInfo; import net.minecraft.commands.synchronization.SingletonArgumentInfo;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import org.geysermc.packgenerator.command.CommandSuggestionsArgumentType; import org.geysermc.rainbow.command.CommandSuggestionsArgumentType;
import org.geysermc.packgenerator.command.PackGeneratorCommand; import org.geysermc.rainbow.command.PackGeneratorCommand;
import org.geysermc.packgenerator.mapper.PackMapper; import org.geysermc.rainbow.mapper.PackMapper;
import org.slf4j.Logger; 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_ID = "rainbow";
public static final String MOD_NAME = "Geyser Mappings Generator"; public static final String MOD_NAME = "Rainbow";
public static final Logger LOGGER = LogUtils.getLogger(); public static final Logger LOGGER = LogUtils.getLogger();
private final PackManager packManager = new PackManager(); private final PackManager packManager = new PackManager();

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.accessor; package org.geysermc.rainbow.accessor;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.accessor; package org.geysermc.rainbow.accessor;
import net.minecraft.client.resources.model.ResolvedModel; import net.minecraft.client.resources.model.ResolvedModel;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.accessor; package org.geysermc.rainbow.accessor;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import net.minecraft.client.renderer.item.ItemModel; import net.minecraft.client.renderer.item.ItemModel;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.command; package org.geysermc.rainbow.command;
import com.mojang.brigadier.StringReader; import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.arguments.ArgumentType; import com.mojang.brigadier.arguments.ArgumentType;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.command; package org.geysermc.rainbow.command;
import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.arguments.StringArgumentType;
@@ -10,10 +10,10 @@ import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import org.geysermc.packgenerator.PackManager; import org.geysermc.rainbow.PackManager;
import org.geysermc.packgenerator.mapper.InventoryMapper; import org.geysermc.rainbow.mapper.InventoryMapper;
import org.geysermc.packgenerator.mapper.ItemSuggestionProvider; import org.geysermc.rainbow.mapper.ItemSuggestionProvider;
import org.geysermc.packgenerator.mapper.PackMapper; import org.geysermc.rainbow.mapper.PackMapper;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@@ -22,7 +22,7 @@ import java.util.function.Consumer;
public class PackGeneratorCommand { public class PackGeneratorCommand {
public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, PackManager packManager, PackMapper packMapper) { public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher, PackManager packManager, PackMapper packMapper) {
dispatcher.register(ClientCommandManager.literal("packgenerator") dispatcher.register(ClientCommandManager.literal("rainbow")
.then(ClientCommandManager.literal("create") .then(ClientCommandManager.literal("create")
.then(ClientCommandManager.argument("name", StringArgumentType.word()) .then(ClientCommandManager.argument("name", StringArgumentType.word())
.executes(context -> { .executes(context -> {

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.mapper; package org.geysermc.rainbow.mapper;
import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.player.LocalPlayer;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.mapper; package org.geysermc.rainbow.mapper;
import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.player.LocalPlayer;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.mapper; package org.geysermc.rainbow.mapper;
import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.player.LocalPlayer;

View File

@@ -1,10 +1,10 @@
package org.geysermc.packgenerator.mapper; package org.geysermc.rainbow.mapper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.player.LocalPlayer;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import org.geysermc.packgenerator.PackManager; import org.geysermc.rainbow.PackManager;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;

View File

@@ -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 @FunctionalInterface
public interface BedrockItemConsumer { public interface BedrockItemConsumer {

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.mapping; package org.geysermc.rainbow.mapping;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import net.minecraft.client.Minecraft; 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.Items;
import net.minecraft.world.item.equipment.trim.TrimMaterial; import net.minecraft.world.item.equipment.trim.TrimMaterial;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import org.geysermc.packgenerator.accessor.BlockModelWrapperLocationAccessor; import org.geysermc.rainbow.accessor.BlockModelWrapperLocationAccessor;
import org.geysermc.packgenerator.accessor.ResolvedModelAccessor; import org.geysermc.rainbow.accessor.ResolvedModelAccessor;
import org.geysermc.packgenerator.accessor.SelectItemModelCasesAccessor; import org.geysermc.rainbow.accessor.SelectItemModelCasesAccessor;
import org.geysermc.packgenerator.mapping.animation.AnimationMapper; import org.geysermc.rainbow.mapping.animation.AnimationMapper;
import org.geysermc.packgenerator.mapping.animation.BedrockAnimationContext; import org.geysermc.rainbow.mapping.animation.BedrockAnimationContext;
import org.geysermc.packgenerator.mapping.attachable.AttachableMapper; import org.geysermc.rainbow.mapping.attachable.AttachableMapper;
import org.geysermc.packgenerator.mapping.geometry.BedrockGeometryContext; import org.geysermc.rainbow.mapping.geometry.BedrockGeometryContext;
import org.geysermc.packgenerator.mapping.geometry.GeometryMapper; import org.geysermc.rainbow.mapping.geometry.GeometryMapper;
import org.geysermc.packgenerator.mapping.geometry.GeometryRenderer; import org.geysermc.rainbow.mapping.geometry.GeometryRenderer;
import org.geysermc.packgenerator.mapping.geyser.GeyserMappings; import org.geysermc.rainbow.mapping.geyser.GeyserMappings;
import org.geysermc.packgenerator.mapping.geyser.GeyserSingleDefinition; import org.geysermc.rainbow.mapping.geyser.GeyserSingleDefinition;
import org.geysermc.packgenerator.mapping.geyser.predicate.GeyserConditionPredicate; import org.geysermc.rainbow.mapping.geyser.predicate.GeyserConditionPredicate;
import org.geysermc.packgenerator.mapping.geyser.predicate.GeyserMatchPredicate; import org.geysermc.rainbow.mapping.geyser.predicate.GeyserMatchPredicate;
import org.geysermc.packgenerator.mapping.geyser.predicate.GeyserPredicate; import org.geysermc.rainbow.mapping.geyser.predicate.GeyserPredicate;
import org.geysermc.packgenerator.mixin.ConditionalItemModelAccessor; import org.geysermc.rainbow.mixin.ConditionalItemModelAccessor;
import org.geysermc.packgenerator.mixin.SelectItemModelAccessor; import org.geysermc.rainbow.mixin.SelectItemModelAccessor;
import org.geysermc.packgenerator.pack.BedrockItem; import org.geysermc.rainbow.pack.BedrockItem;
import org.geysermc.packgenerator.pack.BedrockTextures; import org.geysermc.rainbow.pack.BedrockTextures;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;

View File

@@ -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.ItemTransform;
import net.minecraft.client.renderer.block.model.ItemTransforms; 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.Vector3f;
import org.joml.Vector3fc; import org.joml.Vector3fc;

View File

@@ -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) {
}

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.mapping.attachable; package org.geysermc.rainbow.mapping.attachable;
import com.mojang.datafixers.util.Pair; import com.mojang.datafixers.util.Pair;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@@ -9,10 +9,10 @@ import net.minecraft.core.component.DataComponents;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.equipment.Equippable; import net.minecraft.world.item.equipment.Equippable;
import org.geysermc.packgenerator.mapping.animation.BedrockAnimationContext; import org.geysermc.rainbow.mapping.animation.BedrockAnimationContext;
import org.geysermc.packgenerator.mapping.geometry.BedrockGeometryContext; import org.geysermc.rainbow.mapping.geometry.BedrockGeometryContext;
import org.geysermc.packgenerator.mixin.EntityRenderDispatcherAccessor; import org.geysermc.rainbow.mixin.EntityRenderDispatcherAccessor;
import org.geysermc.packgenerator.pack.attachable.BedrockAttachable; import org.geysermc.rainbow.pack.attachable.BedrockAttachable;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;

View File

@@ -1,6 +1,6 @@
package org.geysermc.packgenerator.mapping.geometry; package org.geysermc.rainbow.mapping.geometry;
import net.minecraft.resources.ResourceLocation; 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) {} public record BedrockGeometryContext(BedrockGeometry geometry, ResourceLocation texture) {}

View File

@@ -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.BlockElement;
import net.minecraft.client.renderer.block.model.BlockElementFace; 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.client.resources.model.ResolvedModel;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation; 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.Vector2f;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.joml.Vector3fc; import org.joml.Vector3fc;

View File

@@ -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.buffers.GpuBuffer;
import com.mojang.blaze3d.platform.NativeImage; 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.client.renderer.item.TrackingItemStackRenderState;
import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import org.geysermc.packgenerator.CodecUtil; import org.geysermc.rainbow.CodecUtil;
import org.geysermc.packgenerator.mixin.PictureInPictureRendererAccessor; import org.geysermc.rainbow.mixin.PictureInPictureRendererAccessor;
import org.geysermc.packgenerator.render.PictureInPictureCopyRenderer; import org.geysermc.rainbow.render.PictureInPictureCopyRenderer;
import org.joml.Matrix3x2fStack; import org.joml.Matrix3x2fStack;
import java.io.IOException; import java.io.IOException;

View File

@@ -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.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;

View File

@@ -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.Codec;
import com.mojang.serialization.DataResult; import com.mojang.serialization.DataResult;

View File

@@ -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.Multimap;
import com.google.common.collect.MultimapBuilder; import com.google.common.collect.MultimapBuilder;
@@ -7,7 +7,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.core.Holder; import net.minecraft.core.Holder;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
import org.geysermc.packgenerator.CodecUtil; import org.geysermc.rainbow.CodecUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

View File

@@ -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.Codec;
import com.mojang.serialization.MapCodec; 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.DataComponentType;
import net.minecraft.core.component.DataComponents; import net.minecraft.core.component.DataComponents;
import net.minecraft.resources.ResourceLocation; 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.List;
import java.util.Optional; import java.util.Optional;

View File

@@ -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.google.common.base.Suppliers;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;

View File

@@ -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.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;

View File

@@ -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.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;

View File

@@ -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.BlockModelWrapper;
import net.minecraft.client.renderer.item.ItemModel; import net.minecraft.client.renderer.item.ItemModel;
import net.minecraft.resources.ResourceLocation; 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.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

View File

@@ -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.ConditionalItemModel;
import net.minecraft.client.renderer.item.ItemModel; import net.minecraft.client.renderer.item.ItemModel;

View File

@@ -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.renderer.entity.EntityRenderDispatcher;
import net.minecraft.client.resources.model.EquipmentAssetManager; import net.minecraft.client.resources.model.EquipmentAssetManager;

View File

@@ -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.GuiItemRenderState;
import net.minecraft.client.gui.render.state.ScreenArea; import net.minecraft.client.gui.render.state.ScreenArea;

View File

@@ -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.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; 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.client.resources.model.ResolvedModel;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.resources.PreparableReloadListener; 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.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.mixin; package org.geysermc.rainbow.mixin;
import com.mojang.blaze3d.textures.GpuTexture; import com.mojang.blaze3d.textures.GpuTexture;
import net.minecraft.client.gui.render.pip.PictureInPictureRenderer; import net.minecraft.client.gui.render.pip.PictureInPictureRenderer;

View File

@@ -1,8 +1,8 @@
package org.geysermc.packgenerator.mixin; package org.geysermc.rainbow.mixin;
import com.mojang.blaze3d.textures.GpuTexture; import com.mojang.blaze3d.textures.GpuTexture;
import net.minecraft.client.gui.render.pip.PictureInPictureRenderer; 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.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;

View File

@@ -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.SelectItemModel;
import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty; import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty;

View File

@@ -1,11 +1,11 @@
package org.geysermc.packgenerator.mixin; package org.geysermc.rainbow.mixin;
import com.llamalad7.mixinextras.sugar.Local; import com.llamalad7.mixinextras.sugar.Local;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap; import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import net.minecraft.client.renderer.item.ItemModel; import net.minecraft.client.renderer.item.ItemModel;
import net.minecraft.client.renderer.item.SelectItemModel; import net.minecraft.client.renderer.item.SelectItemModel;
import net.minecraft.client.renderer.item.properties.select.SelectItemModelProperty; 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.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.mixin; package org.geysermc.rainbow.mixin;
import net.minecraft.client.gui.components.SplashRenderer; import net.minecraft.client.gui.components.SplashRenderer;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;

View File

@@ -1,10 +1,10 @@
package org.geysermc.packgenerator.pack; package org.geysermc.rainbow.pack;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import org.geysermc.packgenerator.mapping.geyser.GeyserSingleDefinition; import org.geysermc.rainbow.mapping.geyser.GeyserSingleDefinition;
import org.geysermc.packgenerator.pack.animation.BedrockAnimation; import org.geysermc.rainbow.pack.animation.BedrockAnimation;
import org.geysermc.packgenerator.pack.attachable.BedrockAttachable; import org.geysermc.rainbow.pack.attachable.BedrockAttachable;
import org.geysermc.packgenerator.pack.geometry.BedrockGeometry; import org.geysermc.rainbow.pack.geometry.BedrockGeometry;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.pack; package org.geysermc.rainbow.pack;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@@ -8,11 +8,11 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.ProblemReporter; import net.minecraft.util.ProblemReporter;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.geysermc.packgenerator.CodecUtil; import org.geysermc.rainbow.CodecUtil;
import org.geysermc.packgenerator.PackConstants; import org.geysermc.rainbow.PackConstants;
import org.geysermc.packgenerator.mapping.BedrockItemMapper; import org.geysermc.rainbow.mapping.BedrockItemMapper;
import org.geysermc.packgenerator.mapping.geyser.GeyserMappings; import org.geysermc.rainbow.mapping.geyser.GeyserMappings;
import org.geysermc.packgenerator.mixin.SplashRendererAccessor; import org.geysermc.rainbow.mixin.SplashRendererAccessor;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@@ -29,7 +29,7 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
public class BedrockPack { 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 PACK_DIRECTORY = Path.of("pack");
private static final Path ATTACHABLES_DIRECTORY = Path.of("attachables"); private static final Path ATTACHABLES_DIRECTORY = Path.of("attachables");
private static final Path GEOMETRY_DIRECTORY = Path.of("models/entity"); private static final Path GEOMETRY_DIRECTORY = Path.of("models/entity");

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.pack; package org.geysermc.rainbow.pack;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.DataResult; import com.mojang.serialization.DataResult;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.pack; package org.geysermc.rainbow.pack;
import com.mojang.datafixers.util.Pair; import com.mojang.datafixers.util.Pair;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.pack; package org.geysermc.rainbow.pack;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.DataResult; import com.mojang.serialization.DataResult;

View File

@@ -1,10 +1,10 @@
package org.geysermc.packgenerator.pack; package org.geysermc.rainbow.pack;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.core.UUIDUtil; import net.minecraft.core.UUIDUtil;
import org.geysermc.packgenerator.CodecUtil; import org.geysermc.rainbow.CodecUtil;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;

View File

@@ -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.datafixers.util.Either;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.DataResult; import com.mojang.serialization.DataResult;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import org.geysermc.packgenerator.CodecUtil; import org.geysermc.rainbow.CodecUtil;
import org.geysermc.packgenerator.pack.BedrockVersion; import org.geysermc.rainbow.pack.BedrockVersion;
import org.joml.Vector3fc; import org.joml.Vector3fc;
import java.io.IOException; import java.io.IOException;

View File

@@ -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.datafixers.util.Pair;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
@@ -9,12 +9,12 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.ExtraCodecs; import net.minecraft.util.ExtraCodecs;
import net.minecraft.util.StringRepresentable; import net.minecraft.util.StringRepresentable;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import org.geysermc.packgenerator.CodecUtil; import org.geysermc.rainbow.CodecUtil;
import org.geysermc.packgenerator.PackConstants; import org.geysermc.rainbow.PackConstants;
import org.geysermc.packgenerator.mapping.geyser.GeyserSingleDefinition; import org.geysermc.rainbow.mapping.geyser.GeyserSingleDefinition;
import org.geysermc.packgenerator.pack.BedrockTextures; import org.geysermc.rainbow.pack.BedrockTextures;
import org.geysermc.packgenerator.pack.BedrockVersion; import org.geysermc.rainbow.pack.BedrockVersion;
import org.geysermc.packgenerator.pack.geometry.BedrockGeometry; import org.geysermc.rainbow.pack.geometry.BedrockGeometry;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.io.IOException; import java.io.IOException;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.pack.attachable; package org.geysermc.rainbow.pack.attachable;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.pack.attachable; package org.geysermc.rainbow.pack.attachable;
public class VanillaMaterials { public class VanillaMaterials {
public static final String ARMOR = "armor"; public static final String ARMOR = "armor";

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.pack.attachable; package org.geysermc.rainbow.pack.attachable;
public class VanillaRenderControllers { public class VanillaRenderControllers {
public static final String ARMOR = "controller.render.armor"; public static final String ARMOR = "controller.render.armor";

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.pack.attachable; package org.geysermc.rainbow.pack.attachable;
public class VanillaTextures { public class VanillaTextures {
public static final String ENCHANTED_ACTOR_GLINT = "misc/enchanted_actor_glint"; public static final String ENCHANTED_ACTOR_GLINT = "misc/enchanted_actor_glint";

View File

@@ -1,11 +1,11 @@
package org.geysermc.packgenerator.pack.geometry; package org.geysermc.rainbow.pack.geometry;
import com.mojang.math.Quadrant; import com.mojang.math.Quadrant;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import org.geysermc.packgenerator.CodecUtil; import org.geysermc.rainbow.CodecUtil;
import org.geysermc.packgenerator.pack.BedrockVersion; import org.geysermc.rainbow.pack.BedrockVersion;
import org.joml.Vector2fc; import org.joml.Vector2fc;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.joml.Vector3fc; import org.joml.Vector3fc;

View File

@@ -1,4 +1,4 @@
package org.geysermc.packgenerator.render; package org.geysermc.rainbow.render;
public interface PictureInPictureCopyRenderer { public interface PictureInPictureCopyRenderer {

View File

@@ -1,29 +1,29 @@
{ {
"schemaVersion": 1, "schemaVersion": 1,
"id": "geyser-mappings-generator", "id": "rainbow",
"version": "${version}", "version": "${version}",
"name": "Geyser Mappings Generator", "name": "Rainbow",
"description": "A mod to generate Geyser mappings (and potentially in the future, full bedrock packs) for use with Geyser's custom item API (v2).", "description": "Rainbow is a mod to generate Geyser mappings and bedrock resourcepacks for use with Geyser's custom item API (v2)",
"authors": [ "authors": [
"GeyserMC contributors" "GeyserMC contributors"
], ],
"contact": { "contact": {
"repo": "https://github.com/GeyserMC/geyser-mappings-generator" "repo": "https://github.com/GeyserMC/rainbow"
}, },
"license": "MIT", "license": "MIT",
"icon": "assets/geyser-mappings-generator/icon.png", "icon": "assets/rainbow/icon.png",
"environment": "client", "environment": "client",
"entrypoints": { "entrypoints": {
"client": [ "client": [
"org.geysermc.packgenerator.GeyserMappingsGenerator" "org.geysermc.rainbow.Rainbow"
] ]
}, },
"mixins": [ "mixins": [
"geyser-mappings-generator.mixins.json" "rainbow.mixins.json"
], ],
"depends": { "depends": {
"fabricloader": ">=${loader_version}", "fabricloader": ">=${loader_version}",
"fabric": "*", "fabric-api": "*",
"minecraft": "${minecraft_version}" "minecraft": "${minecraft_version}"
} }
} }

View File

@@ -1,7 +1,7 @@
{ {
"required": true, "required": true,
"minVersion": "0.8", "minVersion": "0.8",
"package": "org.geysermc.packgenerator.mixin", "package": "org.geysermc.rainbow.mixin",
"compatibilityLevel": "JAVA_21", "compatibilityLevel": "JAVA_21",
"mixins": [], "mixins": [],
"client": [ "client": [