aboutsummaryrefslogtreecommitdiff
path: root/src/compat/wildfireGender/java/moe
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2024-12-09 13:48:52 +0100
committerLinnea Gräf <nea@nea.moe>2024-12-09 13:48:52 +0100
commit706a03807b12ddd5e7c46a72fc27aa30e1f9b60f (patch)
tree48f34b1f5ac0cd1f8c281fb9b49c845ced7eddf0 /src/compat/wildfireGender/java/moe
parent4ae0fd617489a4a18edfbdd6343d88add8b234a7 (diff)
downloadFirmament-706a03807b12ddd5e7c46a72fc27aa30e1f9b60f.tar.gz
Firmament-706a03807b12ddd5e7c46a72fc27aa30e1f9b60f.tar.bz2
Firmament-706a03807b12ddd5e7c46a72fc27aa30e1f9b60f.zip
WIP: re-add gender mod
Diffstat (limited to 'src/compat/wildfireGender/java/moe')
-rw-r--r--src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java32
1 files changed, 9 insertions, 23 deletions
diff --git a/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java b/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java
index 723af59..c3e8950 100644
--- a/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java
+++ b/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java
@@ -1,14 +1,12 @@
package moe.nea.firmament.mixins.compat.wildfiregender;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.sugar.Local;
import com.wildfire.render.GenderArmorLayer;
import moe.nea.firmament.features.texturepack.CustomGlobalArmorOverrides;
-import net.minecraft.item.ArmorItem;
-import net.minecraft.item.ArmorMaterial;
+import net.minecraft.component.type.EquippableComponent;
+import net.minecraft.entity.EquipmentSlot;
import net.minecraft.item.ItemStack;
-import net.minecraft.registry.entry.RegistryEntry;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Pseudo;
import org.spongepowered.asm.mixin.injection.At;
@@ -16,22 +14,10 @@ import org.spongepowered.asm.mixin.injection.At;
@Mixin(GenderArmorLayer.class)
@Pseudo
public class PatchArmorTexturesInGenderMod {
- @WrapOperation(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/LivingEntity;FFFFFF)V",
- at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ArmorItem;getMaterial()Lnet/minecraft/registry/entry/RegistryEntry;"))
- private RegistryEntry<ArmorMaterial> replaceArmorMaterial(ArmorItem instance, Operation<RegistryEntry<ArmorMaterial>> original, @Local ItemStack chestplate) {
- var entry = original.call(instance);
- var overrides = CustomGlobalArmorOverrides.overrideArmor(chestplate);
- if (overrides == null)
- return entry;
- var material = entry.value();
- return RegistryEntry.of(new ArmorMaterial(
- material.defense(),
- material.enchantability(),
- material.equipSound(),
- material.repairIngredient(),
- overrides,
- material.toughness(),
- material.knockbackResistance()
- ));
- }
+ @ModifyExpressionValue(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/BipedEntityRenderState;FF)V",
+ at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;get(Lnet/minecraft/component/ComponentType;)Ljava/lang/Object;"))
+ private Object replaceArmorMaterial(Object original, @Local ItemStack chestplate) {
+ var overrides = CustomGlobalArmorOverrides.overrideArmor(chestplate, EquipmentSlot.CHEST);
+ return overrides.orElse((EquippableComponent) original);
+ }
}