Skip to content

Commit 8992355

Browse files
chore: Update chest tinting code
[no ci]
1 parent 9d85008 commit 8992355

File tree

2 files changed

+18
-67
lines changed

2 files changed

+18
-67
lines changed

mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinTileEntityChestRenderer.java

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,29 @@
1818

1919
package gg.skytils.skytilsmod.mixins.transformers.renderer;
2020

21-
import gg.skytils.skytilsmod.mixins.hooks.renderer.TileEntityChestRendererHookKt;
21+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
22+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
23+
import com.llamalad7.mixinextras.sugar.Local;
24+
import gg.skytils.skytilsmod.features.impl.dungeons.solvers.ThreeWeirdosSolver;
25+
import net.minecraft.block.entity.BlockEntity;
26+
import net.minecraft.client.render.OverlayTexture;
27+
import net.minecraft.client.render.VertexConsumer;
2228
import net.minecraft.client.render.block.entity.ChestBlockEntityRenderer;
23-
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
24-
import net.minecraft.block.entity.ChestBlockEntity;
29+
import net.minecraft.client.render.block.entity.model.ChestBlockModel;
30+
import net.minecraft.client.util.math.MatrixStack;
2531
import org.spongepowered.asm.mixin.Mixin;
2632
import org.spongepowered.asm.mixin.injection.At;
27-
import org.spongepowered.asm.mixin.injection.Inject;
28-
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
2933

3034
@Mixin(ChestBlockEntityRenderer.class)
31-
public abstract class MixinTileEntityChestRenderer extends BlockEntityRenderer<ChestBlockEntity> {
35+
public abstract class MixinTileEntityChestRenderer{
3236

33-
@Inject(method = "render(Lnet/minecraft/block/entity/ChestBlockEntity;DDDFI)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/ChestEntityModel;method_2799()V", shift = At.Shift.BEFORE))
34-
private void setChestColor(ChestBlockEntity te, double x, double y, double z, float partialTicks, int destroyStage, CallbackInfo ci) {
35-
TileEntityChestRendererHookKt.setChestColor(te, x, y, z, partialTicks, destroyStage, ci);
37+
@WrapOperation(method = "render(Lnet/minecraft/block/entity/BlockEntity;FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/util/math/Vec3d;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/entity/ChestBlockEntityRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;Lnet/minecraft/client/render/block/entity/model/ChestBlockModel;FII)V"))
38+
private void setChestColor(ChestBlockEntityRenderer<?> instance, MatrixStack matrices, VertexConsumer vertices, ChestBlockModel model, float animationProgress, int light, int overlay, Operation<Void> original, @Local(argsOnly = true) BlockEntity entity) {
39+
// TODO: look into alternatives
40+
if (entity.getPos() == ThreeWeirdosSolver.riddleChest) {
41+
original.call(instance, matrices, vertices, model, animationProgress, light, OverlayTexture.getUv(0f, true));
42+
return;
43+
}
44+
original.call(instance, matrices, vertices, model, animationProgress, light, overlay);
3645
}
37-
38-
@Inject(method = "render(Lnet/minecraft/block/entity/ChestBlockEntity;DDDFI)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/ChestEntityModel;method_2799()V", shift = At.Shift.AFTER))
39-
private void setChestColorPost(ChestBlockEntity te, double x, double y, double z, float partialTicks, int destroyStage, CallbackInfo ci) {
40-
TileEntityChestRendererHookKt.setChestColorPost(te, x, y, z, partialTicks, destroyStage, ci);
41-
}
42-
4346
}

mod/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)