GeyserMC-Mirror/Rainbow
1
0
Fork 0
mirror of https://github.com/GeyserMC/Rainbow.git synced 2025-12-19 14:59:16 +00:00
Code Issues Releases Activity

Relocate Geyser mapping codecs

Browse Source
This commit is contained in:
Eclipse
2025-10-14 09:07:45 +00:00
parent 7c4c10d9cb
commit b741eac4c6
15 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserBaseDefinition.java → rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserBaseDefinition.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser; package org.geysermc.rainbow.definition;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
@@ -8,7 +8,7 @@ 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.rainbow.Rainbow; import org.geysermc.rainbow.Rainbow;
import org.geysermc.rainbow.mapping.geyser.predicate.GeyserPredicate; import org.geysermc.rainbow.definition.predicate.GeyserPredicate;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java → rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserGroupDefinition.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser; package org.geysermc.rainbow.definition;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserItemDefinition.java → rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserItemDefinition.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser; package org.geysermc.rainbow.definition;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserLegacyDefinition.java → rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserLegacyDefinition.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser; package org.geysermc.rainbow.definition;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java → rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMapping.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser; package org.geysermc.rainbow.definition;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.DataResult; import com.mojang.serialization.DataResult;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java → rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserMappings.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser; package org.geysermc.rainbow.definition;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.MultimapBuilder; import com.google.common.collect.MultimapBuilder;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java → rainbow/src/main/java/org/geysermc/rainbow/definition/GeyserSingleDefinition.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser; package org.geysermc.rainbow.definition;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java → rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserConditionPredicate.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser.predicate; package org.geysermc.rainbow.definition.predicate;
import com.google.common.base.Suppliers; import com.google.common.base.Suppliers;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java → rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserMatchPredicate.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser.predicate; package org.geysermc.rainbow.definition.predicate;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java → rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserPredicate.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser.predicate; package org.geysermc.rainbow.definition.predicate;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserRangeDispatchPredicate.java → rainbow/src/main/java/org/geysermc/rainbow/definition/predicate/GeyserRangeDispatchPredicate.java
View File

@@ -1,4 +1,4 @@
package org.geysermc.rainbow.mapping.geyser.predicate; package org.geysermc.rainbow.definition.predicate;
import com.google.common.base.Suppliers; import com.google.common.base.Suppliers;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;

16
rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java
View File

@@ -42,14 +42,14 @@ import org.geysermc.rainbow.mapping.animation.BedrockAnimationContext;
import org.geysermc.rainbow.mapping.attachable.AttachableMapper; import org.geysermc.rainbow.mapping.attachable.AttachableMapper;
import org.geysermc.rainbow.mapping.geometry.BedrockGeometryContext; import org.geysermc.rainbow.mapping.geometry.BedrockGeometryContext;
import org.geysermc.rainbow.mapping.geometry.GeometryMapper; import org.geysermc.rainbow.mapping.geometry.GeometryMapper;
import org.geysermc.rainbow.mapping.geyser.GeyserBaseDefinition; import org.geysermc.rainbow.definition.GeyserBaseDefinition;
import org.geysermc.rainbow.mapping.geyser.GeyserItemDefinition; import org.geysermc.rainbow.definition.GeyserItemDefinition;
import org.geysermc.rainbow.mapping.geyser.GeyserLegacyDefinition; import org.geysermc.rainbow.definition.GeyserLegacyDefinition;
import org.geysermc.rainbow.mapping.geyser.GeyserSingleDefinition; import org.geysermc.rainbow.definition.GeyserSingleDefinition;
import org.geysermc.rainbow.mapping.geyser.predicate.GeyserConditionPredicate; import org.geysermc.rainbow.definition.predicate.GeyserConditionPredicate;
import org.geysermc.rainbow.mapping.geyser.predicate.GeyserMatchPredicate; import org.geysermc.rainbow.definition.predicate.GeyserMatchPredicate;
import org.geysermc.rainbow.mapping.geyser.predicate.GeyserPredicate; import org.geysermc.rainbow.definition.predicate.GeyserPredicate;
import org.geysermc.rainbow.mapping.geyser.predicate.GeyserRangeDispatchPredicate; import org.geysermc.rainbow.definition.predicate.GeyserRangeDispatchPredicate;
import org.geysermc.rainbow.mixin.LateBoundIdMapperAccessor; import org.geysermc.rainbow.mixin.LateBoundIdMapperAccessor;
import org.geysermc.rainbow.mixin.RangeSelectItemModelAccessor; import org.geysermc.rainbow.mixin.RangeSelectItemModelAccessor;
import org.geysermc.rainbow.mixin.TextureSlotsAccessor; import org.geysermc.rainbow.mixin.TextureSlotsAccessor;

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/PackContext.java
View File

@@ -2,7 +2,7 @@ package org.geysermc.rainbow.mapping;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import org.geysermc.rainbow.mapping.geometry.GeometryRenderer; import org.geysermc.rainbow.mapping.geometry.GeometryRenderer;
import org.geysermc.rainbow.mapping.geyser.GeyserMappings; import org.geysermc.rainbow.definition.GeyserMappings;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.function.Consumer; import java.util.function.Consumer;

2
rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java
View File

@@ -20,7 +20,7 @@ import org.geysermc.rainbow.mapping.AssetResolver;
import org.geysermc.rainbow.mapping.BedrockItemMapper; import org.geysermc.rainbow.mapping.BedrockItemMapper;
import org.geysermc.rainbow.mapping.PackContext; import org.geysermc.rainbow.mapping.PackContext;
import org.geysermc.rainbow.mapping.geometry.NoopGeometryRenderer; import org.geysermc.rainbow.mapping.geometry.NoopGeometryRenderer;
import org.geysermc.rainbow.mapping.geyser.GeyserMappings; import org.geysermc.rainbow.definition.GeyserMappings;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.io.FileOutputStream; import java.io.FileOutputStream;

5
rainbow/src/main/resources/fabric.mod.json
View File

@@ -15,11 +15,6 @@
"license": "MIT", "license": "MIT",
"icon": "assets/rainbow/icon.png", "icon": "assets/rainbow/icon.png",
"environment": "client", "environment": "client",
"entrypoints": {
"client": [
"org.geysermc.rainbow.Rainbow"
]
},
"mixins": [ "mixins": [
"rainbow.mixins.json" "rainbow.mixins.json"
], ],