Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package ch.voidlee.repair.mixin.client.accessor;

import net.minecraft.client.model.RabbitModel;
import net.minecraft.client.model.geom.ModelPart;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;

@Mixin(RabbitModel.class)
public interface RabbitModelAccessor {
@Accessor("head")
ModelPart create_repair$getHead();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package ch.voidlee.repair.mixin.client.tweaks;

import ch.voidlee.repair.mixin.client.accessor.RabbitModelAccessor;
import com.llamalad7.mixinextras.sugar.Local;
import com.mojang.blaze3d.vertex.PoseStack;
import com.simibubi.create.content.equipment.hats.CreateHatArmorLayer;
import com.simibubi.create.content.trains.schedule.hat.TrainHatInfo;
import net.minecraft.client.model.EntityModel;
import net.minecraft.client.model.RabbitModel;
import net.minecraft.client.model.geom.ModelPart;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.List;

@Mixin(CreateHatArmorLayer.class)
public abstract class CreateHatArmorLayerMixin {

@Inject(method = "registerOn", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/renderer/entity/LivingEntityRenderer;getModel()Lnet/minecraft/client/model/EntityModel;"), cancellable = true, remap = false)
private static void create_repair$addCustomModelException(EntityRenderer<?> entityRenderer, CallbackInfo ci, @Local(name = "livingRenderer") LivingEntityRenderer<?, ?> livingRenderer, @Local(name = "model") EntityModel<?> model) {
if (model instanceof RabbitModel) {
CreateHatArmorLayer<?, ?> layer = new CreateHatArmorLayer<>(livingRenderer);
livingRenderer.addLayer((CreateHatArmorLayer) layer);
ci.cancel();
}
}

@Inject(method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V", at = @At(value = "INVOKE", target = "Ljava/util/List;isEmpty()Z", ordinal = 0), remap = false)
private void create_repair$injectCustomHatModelRender(CallbackInfo ci, @Local(argsOnly = true) PoseStack ms, @Local(name = "entityModel") EntityModel<?> entityModel, @Local(name = "info") TrainHatInfo info, @Local(name = "partsToHead") List<ModelPart> partsToHead) {
if (entityModel instanceof RabbitModel<?> model) {
if (model.young) {
ms.scale(0.56666666F, 0.56666666F, 0.56666666F);
ms.translate(0.0F, 1.375F, 0.125F);
} else {
ms.scale(0.6F, 0.6F, 0.6F);
ms.translate(0.0F, 1.0F, 0.0F);
}
ModelPart head = ((RabbitModelAccessor) model).create_repair$getHead();
partsToHead.addAll(TrainHatInfo.getAdjustedPart(info, head, "head"));
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"offset": [
0.0,
-1.0,
-2.5
]
}
4 changes: 3 additions & 1 deletion src/main/resources/mixins.create_repair.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"client": [
"client.CreateMainMenuScreenMixin",
"client.OptionsMixin",
"client.accessor.RabbitModelAccessor",
"client.bug_fixes.CopycatModelMixin",
"client.bug_fixes.RadialWrenchMenuMixin",
"client.bug_fixes.ScheduleScreenMixin",
Expand All @@ -102,7 +103,8 @@
"client.crash_fixes.ClipboardScreenMixin",
"client.crash_fixes.ContraptionUOEMixin",
"client.crash_fixes.ponder_keybind.PonderKeybindsMixin",
"client.crash_fixes.ponder_keybind.PonderTooltipHandlerMixin"
"client.crash_fixes.ponder_keybind.PonderTooltipHandlerMixin",
"client.tweaks.CreateHatArmorLayerMixin"
],
"mixinextras": {
"minVersion": "0.5.3"
Expand Down