- Update Netherite Elytra to be mixin based

OroArmor · OroArmor · commit 8f5f8ddb51e2 · 2021-03-05T14:21:51.000-08:00
- Some Other Cleaning
diff --git a/common/src/main/java/com/oroarmor/netherite_plus/NetheritePlusModPlatform.java b/common/src/main/java/com/oroarmor/netherite_plus/NetheritePlusModPlatform.java
@@ -5,11 +5,6 @@
 import net.minecraft.item.Item;
 
 public class NetheritePlusModPlatform {
-    @ExpectPlatform
-    public static Item getElytraItem(Item.Settings elytraSettings) {
-        throw new AssertionError();
-    }
-
     @ExpectPlatform
     public static Item.Settings setISTER(Item.Settings properties) {
         throw new AssertionError();
diff --git a/common/src/main/java/com/oroarmor/netherite_plus/item/NetheritePlusItems.java b/common/src/main/java/com/oroarmor/netherite_plus/item/NetheritePlusItems.java
@@ -82,7 +82,7 @@ private static void registerBowAndCrossbow() {
     private static void registerElytra() {
         Item.Settings elytraSettings = new Item.Settings().maxDamage(NetheritePlusConfig.DURABILITIES.ELYTRA_DURABILITY.getValue()).group(ItemGroup.TRANSPORTATION).rarity(Rarity.UNCOMMON).fireproof();
 
-        NETHERITE_ELYTRA = register(id("netherite_elytra"), () -> NetheritePlusModPlatform.getElytraItem(elytraSettings));
+        NETHERITE_ELYTRA = register(id("netherite_elytra"), () -> new NetheriteElytraItem(elytraSettings));
     }
 
     private static void registerFishingRod() {
diff --git a/common/src/main/java/com/oroarmor/netherite_plus/mixin/render/TridentEntityRendererMixin.java b/common/src/main/java/com/oroarmor/netherite_plus/mixin/render/TridentEntityRendererMixin.java
@@ -4,7 +4,9 @@
 import com.oroarmor.netherite_plus.item.NetheritePlusItems;
 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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import net.minecraft.client.render.entity.TridentEntityRenderer;
 import net.minecraft.entity.projectile.TridentEntity;
@@ -14,8 +16,10 @@
 
 @Mixin(TridentEntityRenderer.class)
 public class TridentEntityRendererMixin {
-    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/TridentEntityRenderer;getTexture(Lnet/minecraft/entity/projectile/TridentEntity;)Lnet/minecraft/util/Identifier;"))
-    public Identifier getTextureMixin(TridentEntityRenderer renderer, TridentEntity entity) {
-        return NetheritePlusConfig.ENABLED.ENABLED_TRIDENT.getValue() && entity.tridentStack.getItem() == NetheritePlusItems.NETHERITE_TRIDENT.get() ? id("textures/entity/netherite_trident.png") : TridentEntityRenderer.TEXTURE;
+    @Inject(method = "getTexture", at = @At(value = "HEAD"), cancellable = true)
+    public void getTextureMixin(TridentEntity entity, CallbackInfoReturnable<Identifier> cir) {
+        if(NetheritePlusConfig.ENABLED.ENABLED_TRIDENT.getValue() && entity.tridentStack.getItem() == NetheritePlusItems.NETHERITE_TRIDENT.get()) {
+            cir.setReturnValue(id("textures/entity/netherite_trident.png"));
+        }
     }
 }
diff --git a/fabric/src/main/java/com/oroarmor/netherite_plus/compatibility/NetheritePlusTrinketsCompatibilty.java b/fabric/src/main/java/com/oroarmor/netherite_plus/compatibility/NetheritePlusTrinketsCompatibilty.java
diff --git a/fabric/src/main/java/com/oroarmor/netherite_plus/fabric/NetheritePlusModPlatformImpl.java b/fabric/src/main/java/com/oroarmor/netherite_plus/fabric/NetheritePlusModPlatformImpl.java
@@ -1,15 +1,8 @@
 package com.oroarmor.netherite_plus.fabric;
 
-import com.oroarmor.netherite_plus.compatibility.NetheritePlusTrinketsCompatibilty;
-import com.oroarmor.netherite_plus.item.NetheriteElytraItem;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.item.Item;
 
 public class NetheritePlusModPlatformImpl {
-	public static Item getElytraItem(Item.Settings elytraSettings) {
-		return !FabricLoader.getInstance().isModLoaded("trinkets") ? new NetheriteElytraItem(elytraSettings) : NetheritePlusTrinketsCompatibilty.getTrinketsElytra(elytraSettings);
-	}
-
 	public static Item.Settings setISTER(Item.Settings properties) {
 		return properties;
 	}
diff --git a/fabric/src/main/java/com/oroarmor/netherite_plus/item/NetheriteElytraItem_Trinkets.java b/fabric/src/main/java/com/oroarmor/netherite_plus/item/NetheriteElytraItem_Trinkets.java
diff --git a/fabric/src/main/java/com/oroarmor/netherite_plus/mixin/FishingBobberEntityMixin.java b/fabric/src/main/java/com/oroarmor/netherite_plus/mixin/FishingBobberEntityMixin.java
diff --git a/fabric/src/main/java/com/oroarmor/netherite_plus/mixin/NetheritePlusMixinPlugin.java b/fabric/src/main/java/com/oroarmor/netherite_plus/mixin/NetheritePlusMixinPlugin.java
@@ -1,4 +1,4 @@
-package com.oroarmor.netherite_plus.mixin.better_end;
+package com.oroarmor.netherite_plus.mixin;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,7 +11,7 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
 
-public class BetterEndMixinCompatibility implements IMixinConfigPlugin {
+public class NetheritePlusMixinPlugin implements IMixinConfigPlugin {
     @Override
     public void onLoad(String mixinPackage) {
     }
@@ -23,14 +23,6 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        if(!FabricLoader.getInstance().isModLoaded("betterend")) {
-            return false;
-        }
-
-        if (mixinClassName.equals("com.oroarmor.netherite_plus.mixin.better_end.NetheriteAnvilScreenMixin")) {
-            return FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT;
-        }
-
         return true;
     }
 
@@ -47,6 +39,9 @@ public List<String> getMixins() {
                     this.add("better_end.NetheriteAnvilScreenMixin");
                 }
             }
+            if(FabricLoader.getInstance().isModLoaded("trinkets")) {
+                this.add("trinkets.NetheriteElytraMixin");
+            }
         }};
     }
 
diff --git a/fabric/src/main/java/com/oroarmor/netherite_plus/mixin/trinkets/NetheriteElytraMixin.java b/fabric/src/main/java/com/oroarmor/netherite_plus/mixin/trinkets/NetheriteElytraMixin.java
@@ -0,0 +1,78 @@
+package com.oroarmor.netherite_plus.mixin.trinkets;
+
+import java.util.List;
+
+import com.oroarmor.netherite_plus.compatibility.NetheritePlusTrinketsRenderer;
+import com.oroarmor.netherite_plus.config.NetheritePlusConfig;
+import com.oroarmor.netherite_plus.item.NetheriteElytraItem;
+import dev.emi.trinkets.api.Slots;
+import dev.emi.trinkets.api.Trinket;
+import dev.emi.trinkets.api.TrinketItem;
+import dev.emi.trinkets.api.TrinketsApi;
+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 net.minecraft.block.DispenserBlock;
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.entity.model.PlayerEntityModel;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Hand;
+import net.minecraft.util.TypedActionResult;
+import net.minecraft.world.World;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+
+@Mixin(NetheriteElytraItem.class)
+public class NetheriteElytraMixin extends Item implements Trinket {
+    public NetheriteElytraMixin(Settings settings) {
+        super(settings);
+    }
+
+    @Inject(method = "<init>", at = @At("TAIL"))
+    public void init(Item.Settings settings, CallbackInfo info) {
+        DispenserBlock.registerBehavior(this, TrinketItem.TRINKET_DISPENSER_BEHAVIOR);
+    }
+
+    @Override
+    public void appendTooltip(ItemStack stack, World world, List<Text> tooltip, TooltipContext context) {
+        tooltip.add(new TranslatableText("warning.netherite_elytra.trinkets"));
+        super.appendTooltip(stack, world, tooltip, context);
+    }
+
+    @Override
+    public boolean canWearInSlot(String group, String slot) {
+        return slot.equals(Slots.CAPE);
+    }
+
+    @Override
+    public void onEquip(PlayerEntity player, ItemStack stack) {
+        player.getAttributes().getCustomInstance(EntityAttributes.GENERIC_ARMOR).setBaseValue(NetheritePlusConfig.DAMAGE.ELYTRA_ARMOR_POINTS.getValue() + player.getAttributes().getCustomInstance(EntityAttributes.GENERIC_ARMOR).getBaseValue());
+    }
+
+    @Override
+    public void onUnequip(PlayerEntity player, ItemStack stack) {
+        player.getAttributes().getCustomInstance(EntityAttributes.GENERIC_ARMOR).setBaseValue(-NetheritePlusConfig.DAMAGE.ELYTRA_ARMOR_POINTS.getValue() + player.getAttributes().getCustomInstance(EntityAttributes.GENERIC_ARMOR).getBaseValue());
+    }
+
+    @Environment(EnvType.CLIENT)
+    @Override
+    public void render(String slot, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light, PlayerEntityModel<AbstractClientPlayerEntity> model, AbstractClientPlayerEntity livingEntity, float headYaw, float headPitch) {
+        NetheritePlusTrinketsRenderer.renderTrinketsElytra(matrixStack, vertexConsumerProvider, light, livingEntity, TrinketsApi.getTrinketComponent(livingEntity).getStack(slot));
+    }
+
+    @Override
+    public TypedActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) {
+        return Trinket.equipTrinket(player, hand);
+    }
+}
diff --git a/fabric/src/main/resources/netherite-plus-mod-fabric.mixins.json b/fabric/src/main/resources/netherite-plus-mod-fabric.mixins.json
@@ -4,13 +4,12 @@
   "package": "com.oroarmor.netherite_plus.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "FishingBobberEntityMixin",
     "ShulkerBoxBlockEntityMixin",
     "ShulkerBoxSlotMixin"
   ],
   "client": [
   ],
-  "plugin": "com.oroarmor.netherite_plus.mixin.better_end.BetterEndMixinCompatibility",
+  "plugin": "com.oroarmor.netherite_plus.mixin.NetheritePlusMixinPlugin",
   "injectors": {
     "defaultRequire": 1
   }
diff --git a/forge/src/main/java/com/oroarmor/netherite_plus/forge/NetheritePlusModPlatformImpl.java b/forge/src/main/java/com/oroarmor/netherite_plus/forge/NetheritePlusModPlatformImpl.java
@@ -1,16 +1,11 @@
 package com.oroarmor.netherite_plus.forge;
 
 import com.oroarmor.netherite_plus.client.ForgeNetheritePlusModClient;
-import com.oroarmor.netherite_plus.item.ForgeNetheriteElytra;
 import net.minecraft.item.Item;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.DistExecutor;
 
 public class NetheritePlusModPlatformImpl {
-	public static Item getElytraItem(Item.Settings elytraSettings) {
-		return new ForgeNetheriteElytra(elytraSettings);
-	}
-
 	public static Item.Settings setISTER(Item.Settings properties) {
 		DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> ForgeNetheritePlusModClient.addISTER(properties));
 		return properties;
diff --git a/forge/src/main/java/com/oroarmor/netherite_plus/item/ForgeNetheriteElytra.java b/forge/src/main/java/com/oroarmor/netherite_plus/item/ForgeNetheriteElytra.java
diff --git a/forge/src/main/java/com/oroarmor/netherite_plus/mixin/NetheriteElytraMixin.java b/forge/src/main/java/com/oroarmor/netherite_plus/mixin/NetheriteElytraMixin.java
@@ -0,0 +1,26 @@
+package com.oroarmor.netherite_plus.mixin;
+
+import com.oroarmor.netherite_plus.item.NetheriteElytraItem;
+import net.minecraftforge.common.extensions.IForgeItem;
+import org.spongepowered.asm.mixin.Mixin;
+
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+@Mixin(NetheriteElytraItem.class)
+public class NetheriteElytraMixin extends Item implements IForgeItem {
+    public NetheriteElytraMixin(Settings properties) {
+        super(properties);
+    }
+
+    @Override
+    public boolean canElytraFly(ItemStack stack, LivingEntity entity) {
+        return stack.getDamage() < stack.getMaxDamage();
+    }
+
+    @Override
+    public boolean elytraFlightTick(ItemStack stack, LivingEntity entity, int flightTicks) {
+        return true;
+    }
+}
diff --git a/forge/src/main/resources/netherite-plus-forge.mixins.json b/forge/src/main/resources/netherite-plus-forge.mixins.json
@@ -4,7 +4,8 @@
   "package": "com.oroarmor.netherite_plus.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "NetheriteAnvilScreenHandlerMixin"
+    "NetheriteAnvilScreenHandlerMixin",
+    "NetheriteElytraMixin"
   ],
   "client": [
   ],

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private static void registerBowAndCrossbow() {`
`82`	`82`	`private static void registerElytra() {`
`83`	`83`	`Item.Settings elytraSettings = new Item.Settings().maxDamage(NetheritePlusConfig.DURABILITIES.ELYTRA_DURABILITY.getValue()).group(ItemGroup.TRANSPORTATION).rarity(Rarity.UNCOMMON).fireproof();`
`84`	`84`
`85`		`- NETHERITE_ELYTRA = register(id("netherite_elytra"), () -> NetheritePlusModPlatform.getElytraItem(elytraSettings));`
	`85`	`+ NETHERITE_ELYTRA = register(id("netherite_elytra"), () -> new NetheriteElytraItem(elytraSettings));`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`private static void registerFishingRod() {`