diff --git a/src/main/java/org/geysermc/rainbow/accessor/BlockModelWrapperLocationAccessor.java b/src/main/java/org/geysermc/rainbow/accessor/BlockModelWrapperLocationAccessor.java index ed01044..7e36bc5 100644 --- a/src/main/java/org/geysermc/rainbow/accessor/BlockModelWrapperLocationAccessor.java +++ b/src/main/java/org/geysermc/rainbow/accessor/BlockModelWrapperLocationAccessor.java @@ -5,7 +5,7 @@ import net.minecraft.resources.ResourceLocation; // Implemented on BlockModelWrapper, since this class doesn't store its model after baking, we have to store it manually public interface BlockModelWrapperLocationAccessor { - ResourceLocation geyser_mappings_generator$getModelOrigin(); + ResourceLocation rainbow$getModelOrigin(); - void geyser_mappings_generator$setModelOrigin(ResourceLocation model); + void rainbow$setModelOrigin(ResourceLocation model); } diff --git a/src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java b/src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java index ce5c0a5..e9dcbd7 100644 --- a/src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java +++ b/src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java @@ -8,5 +8,5 @@ import java.util.Optional; // Implemented on ModelManager, since this class doesn't keep the resolved models after baking, we have to store it manually public interface ResolvedModelAccessor { - Optional geyser_mappings_generator$getResolvedModel(ResourceLocation location); + Optional rainbow$getResolvedModel(ResourceLocation location); } diff --git a/src/main/java/org/geysermc/rainbow/accessor/SelectItemModelCasesAccessor.java b/src/main/java/org/geysermc/rainbow/accessor/SelectItemModelCasesAccessor.java index 79d8cb6..fc67392 100644 --- a/src/main/java/org/geysermc/rainbow/accessor/SelectItemModelCasesAccessor.java +++ b/src/main/java/org/geysermc/rainbow/accessor/SelectItemModelCasesAccessor.java @@ -6,7 +6,7 @@ import net.minecraft.client.renderer.item.ItemModel; // Implemented on BlockModelWrapper, since this class doesn't store the cases it has in a nice format after baking, we have to store it manually public interface SelectItemModelCasesAccessor { - Object2ObjectMap geyser_mappings_generator$getCases(); + Object2ObjectMap rainbow$getCases(); - void geyser_mappings_generator$setCases(Object2ObjectMap cases); + void rainbow$setCases(Object2ObjectMap cases); } diff --git a/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java b/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java index c254773..9a921a3 100644 --- a/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java +++ b/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java @@ -79,9 +79,9 @@ public class BedrockItemMapper { private static void mapItem(ItemModel model, MappingContext context) { switch (model) { case BlockModelWrapper modelWrapper -> { - ResourceLocation itemModelLocation = ((BlockModelWrapperLocationAccessor) modelWrapper).geyser_mappings_generator$getModelOrigin(); + ResourceLocation itemModelLocation = ((BlockModelWrapperLocationAccessor) modelWrapper).rainbow$getModelOrigin(); - ((ResolvedModelAccessor) Minecraft.getInstance().getModelManager()).geyser_mappings_generator$getResolvedModel(itemModelLocation) + ((ResolvedModelAccessor) Minecraft.getInstance().getModelManager()).rainbow$getResolvedModel(itemModelLocation) .ifPresentOrElse(itemModel -> { ResolvedModel parentModel = itemModel.parent(); boolean handheld = false; @@ -153,7 +153,7 @@ public class BedrockItemMapper { } //noinspection unchecked - Object2ObjectMap cases = ((SelectItemModelCasesAccessor) model).geyser_mappings_generator$getCases(); + Object2ObjectMap cases = ((SelectItemModelCasesAccessor) model).rainbow$getCases(); cases.forEach((key, value) -> mapItem(value, context.with(new GeyserMatchPredicate(dataConstructor.apply(key)), "select case " + key + " "))); mapItem(cases.defaultReturnValue(), context.child("default case ")); diff --git a/src/main/java/org/geysermc/rainbow/mixin/BlockModelWrapperMixin.java b/src/main/java/org/geysermc/rainbow/mixin/BlockModelWrapperMixin.java index 6e9a1e0..e59bc68 100644 --- a/src/main/java/org/geysermc/rainbow/mixin/BlockModelWrapperMixin.java +++ b/src/main/java/org/geysermc/rainbow/mixin/BlockModelWrapperMixin.java @@ -19,12 +19,12 @@ public abstract class BlockModelWrapperMixin implements ItemModel, BlockModelWra private ResourceLocation modelOrigin; @Override - public ResourceLocation geyser_mappings_generator$getModelOrigin() { + public ResourceLocation rainbow$getModelOrigin() { return modelOrigin; } @Override - public void geyser_mappings_generator$setModelOrigin(ResourceLocation model) { + public void rainbow$setModelOrigin(ResourceLocation model) { modelOrigin = model; } @@ -37,7 +37,7 @@ public abstract class BlockModelWrapperMixin implements ItemModel, BlockModelWra @Inject(method = "bake", at = @At("TAIL")) public void setModelOrigin(BakingContext context, CallbackInfoReturnable callbackInfoReturnable) { - ((BlockModelWrapperLocationAccessor) callbackInfoReturnable.getReturnValue()).geyser_mappings_generator$setModelOrigin(model); + ((BlockModelWrapperLocationAccessor) callbackInfoReturnable.getReturnValue()).rainbow$setModelOrigin(model); } } } diff --git a/src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java b/src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java index 138b9c4..171ca46 100644 --- a/src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java +++ b/src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java @@ -36,7 +36,7 @@ public abstract class ModelManagerMixin implements PreparableReloadListener, Aut } @Override - public Optional geyser_mappings_generator$getResolvedModel(ResourceLocation location) { + public Optional rainbow$getResolvedModel(ResourceLocation location) { return unbakedResolvedModels == null ? Optional.empty() : Optional.ofNullable(unbakedResolvedModels.get(location)); } } diff --git a/src/main/java/org/geysermc/rainbow/mixin/SelectItemModelMixin.java b/src/main/java/org/geysermc/rainbow/mixin/SelectItemModelMixin.java index 4e848bd..97cdb85 100644 --- a/src/main/java/org/geysermc/rainbow/mixin/SelectItemModelMixin.java +++ b/src/main/java/org/geysermc/rainbow/mixin/SelectItemModelMixin.java @@ -19,12 +19,12 @@ public abstract class SelectItemModelMixin implements ItemModel, SelectItemMo private Object2ObjectMap cases; @Override - public Object2ObjectMap geyser_mappings_generator$getCases() { + public Object2ObjectMap rainbow$getCases() { return cases; } @Override - public void geyser_mappings_generator$setCases(Object2ObjectMap cases) { + public void rainbow$setCases(Object2ObjectMap cases) { this.cases = cases; } @@ -35,7 +35,7 @@ public abstract class SelectItemModelMixin implements ItemModel, SelectItemMo public void setCases(BakingContext bakingContext, ItemModel model, CallbackInfoReturnable callbackInfoReturnable, @Local Object2ObjectMap cases) { //noinspection unchecked - ((SelectItemModelCasesAccessor) callbackInfoReturnable.getReturnValue()).geyser_mappings_generator$setCases(cases); + ((SelectItemModelCasesAccessor) callbackInfoReturnable.getReturnValue()).rainbow$setCases(cases); } } }