Skip to content

Commit

Permalink
Revert how villagers looked prior to 1.14
Browse files Browse the repository at this point in the history
Undo weird formatting in viafabricplus.mixins.json

Try to fix it again

Re-add mixin for this PR
  • Loading branch information
lowercasebtw committed Dec 7, 2024
1 parent 4ae8e90 commit 6b8ee74
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <[email protected]> and RK_01/RaphiMC
* Copyright (C) 2023-2024 contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity;

import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
import net.minecraft.client.render.entity.feature.VillagerClothingFeatureRenderer;
import net.minecraft.village.VillagerData;
import net.minecraft.village.VillagerProfession;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;

@Mixin(VillagerClothingFeatureRenderer.class)
public abstract class MixinVillagerClothingFeatureRenderer {

@Redirect(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/LivingEntityRenderState;FF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/village/VillagerData;getProfession()Lnet/minecraft/village/VillagerProfession;"))
private VillagerProfession revertVillagerVisual(VillagerData instance) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_13_2)) {
return VillagerProfession.NONE;
} else {
return instance.getProfession();
}
}

}
3 changes: 2 additions & 1 deletion src/main/resources/viafabricplus.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
"fixes.minecraft.entity.MixinPlayerEntityRenderer",
"fixes.minecraft.entity.MixinSkeletonHorseEntity",
"fixes.minecraft.entity.MixinSquidEntity",
"fixes.minecraft.entity.MixinVillagerClothingFeatureRenderer",
"fixes.minecraft.entity.MixinWolfEntity",
"fixes.minecraft.entity.MixinZombieVillagerEntity",
"fixes.minecraft.item.MixinAxeItem",
Expand Down Expand Up @@ -228,4 +229,4 @@
"overwrites": {
"requireAnnotations": true
}
}
}

0 comments on commit 6b8ee74

Please sign in to comment.