Skip to content

Commit b9fad1f

Browse files
committed
Actually fix trinkets elytra issue
1 parent 86f0c46 commit b9fad1f

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

fabric/src/main/java/com/oroarmor/netherite_plus/client/NetheritePlusClientModFabric.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@
1010
import com.oroarmor.netherite_plus.client.render.item.NetheriteShulkerBoxItemRenderer;
1111
import com.oroarmor.netherite_plus.client.render.item.NetheriteTridentItemRenderer;
1212
import com.oroarmor.netherite_plus.config.NetheritePlusConfig;
13+
import com.oroarmor.netherite_plus.item.NetheritePlusItems;
1314
import com.oroarmor.netherite_plus.screen.NetheritePlusScreenHandlers;
1415
import net.fabricmc.api.ClientModInitializer;
1516
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
17+
import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
1618
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
1719
import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
1820
import net.fabricmc.fabric.api.client.rendereregistry.v1.LivingEntityFeatureRendererRegistrationCallback;
1921
import net.fabricmc.fabric.api.client.rendereregistry.v1.LivingEntityFeatureRendererRegistrationCallback.RegistrationHelper;
2022
import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry;
23+
import net.fabricmc.loader.api.FabricLoader;
24+
2125
import net.minecraft.block.entity.BlockEntityType;
2226
import net.minecraft.client.render.RenderLayer;
2327
import net.minecraft.client.render.entity.LivingEntityRenderer;
@@ -26,6 +30,7 @@
2630
import net.minecraft.client.render.entity.model.PlayerEntityModel;
2731
import net.minecraft.entity.EntityType;
2832
import net.minecraft.entity.LivingEntity;
33+
import net.minecraft.text.TranslatableText;
2934

3035
import static com.oroarmor.netherite_plus.NetheritePlusMod.id;
3136
import static com.oroarmor.netherite_plus.item.NetheritePlusItems.*;
@@ -83,5 +88,13 @@ public void onInitializeClient() {
8388
ClientPlayNetworking.registerGlobalReceiver(id("lava_vision_update"), (minecraft, listener, buf, sender) -> {
8489
NetheritePlusClientMod.LAVA_VISION_DISTANCE = buf.getDouble(0);
8590
});
91+
92+
if (FabricLoader.getInstance().isModLoaded("trinkets") && NetheritePlusConfig.ENABLED.ENABLED_ELYTRA.getValue()) {
93+
ItemTooltipCallback.EVENT.register((stack, context, lines) -> {
94+
if (stack.getItem() == NETHERITE_ELYTRA.get()) {
95+
lines.add(new TranslatableText("warning.netherite_elytra.trinkets"));
96+
}
97+
});
98+
}
8699
}
87100
}

fabric/src/main/java/com/oroarmor/netherite_plus/mixin/trinkets/NetheriteElytraMixin.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@
2121
import net.minecraft.entity.player.PlayerEntity;
2222
import net.minecraft.item.Item;
2323
import net.minecraft.item.ItemStack;
24-
import net.minecraft.text.TranslatableText;
2524
import net.minecraft.util.Hand;
2625
import net.minecraft.util.TypedActionResult;
2726
import net.minecraft.world.World;
2827

2928
import net.fabricmc.api.EnvType;
3029
import net.fabricmc.api.Environment;
31-
import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
3230

3331
@Mixin(NetheriteElytraItem.class)
3432
public class NetheriteElytraMixin extends Item implements Trinket {
@@ -39,12 +37,6 @@ private NetheriteElytraMixin(Settings settings) {
3937
@Inject(method = "<init>", at = @At("TAIL"))
4038
public void init(Item.Settings settings, CallbackInfo info) {
4139
DispenserBlock.registerBehavior(this, TrinketItem.TRINKET_DISPENSER_BEHAVIOR);
42-
43-
ItemTooltipCallback.EVENT.register((stack, context, lines) -> {
44-
if (stack.getItem() == this) {
45-
lines.add(new TranslatableText("warning.netherite_elytra.trinkets"));
46-
}
47-
});
4840
}
4941

5042
@Override

0 commit comments

Comments
 (0)