From a03036e9db417c8548df90b1bf13bd9f18d79f83 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Sat, 14 Jan 2023 17:26:37 -0600 Subject: [PATCH] Goggles. --- .../mod/items/ItemEngineerGoggles.java | 7 ++++--- ...yer_1.png => goggles_armor_material_layer_1.png} | Bin ...yer_2.png => goggles_armor_material_layer_2.png} | Bin 3 files changed, 4 insertions(+), 3 deletions(-) rename src/main/resources/assets/actuallyadditions/textures/models/armor/{armor_goggles_layer_1.png => goggles_armor_material_layer_1.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/models/armor/{armor_goggles_layer_2.png => goggles_armor_material_layer_2.png} (100%) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java index 8a6805166..1c024810f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemEngineerGoggles.java @@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.material.ArmorMaterials; import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import io.netty.util.internal.ConcurrentSet; +import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -40,7 +41,7 @@ public class ItemEngineerGoggles extends ItemArmorAA implements IGoggles { super(ArmorMaterials.GOGGLES, EquipmentSlotType.HEAD, ActuallyItems.defaultProps().setNoRepair().durability(0)); this.displayMobs = displayMobs; - //MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(this); } public static boolean isWearing(PlayerEntity player) { @@ -51,7 +52,7 @@ public class ItemEngineerGoggles extends ItemArmorAA implements IGoggles { @OnlyIn(Dist.CLIENT) @SubscribeEvent public void onClientTick(TickEvent.ClientTickEvent event) { - /* PlayerEntity player = ClientProxy.getCurrentPlayer(); + PlayerEntity player = Minecraft.getInstance().player; if (player != null && isWearing(player)) { ItemStack face = player.inventory.armor.get(3); if (((IGoggles) face.getItem()).displaySpectralMobs()) { @@ -85,7 +86,7 @@ public class ItemEngineerGoggles extends ItemArmorAA implements IGoggles { } } this.cachedGlowingEntities.clear(); - }*/ + } } @Override diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_goggles_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_1.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_goggles_layer_1.png rename to src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_1.png diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/armor_goggles_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_2.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/models/armor/armor_goggles_layer_2.png rename to src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_2.png