Skip to content

Commit 9283e44

Browse files
committed
Cleaned up Aetheric Goggles item implementation
1 parent 34665aa commit 9283e44

File tree

6 files changed

+536
-106
lines changed

6 files changed

+536
-106
lines changed

src/main/java/dev/overgrown/thaumaturge/Thaumaturge.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,10 @@ public void onInitialize() {
5454
SpellCastPacket.registerServer();
5555

5656
// Register server tick event for cooldowns
57-
ServerTickEvents.END_SERVER_TICK.register(server -> {
58-
SpellCooldownManager.tick();
59-
});
57+
ServerTickEvents.END_SERVER_TICK.register(server -> SpellCooldownManager.tick());
6058

6159
// Register player disconnect event to clean up cooldowns
62-
ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> {
63-
SpellCooldownManager.removePlayer(handler.player.getUuid());
64-
});
60+
ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> SpellCooldownManager.removePlayer(handler.player.getUuid()));
6561

6662
// Register recipe type and serializer
6763
Registry.register(Registries.RECIPE_SERIALIZER, identifier("vessel"), VesselRecipe.Serializer.INSTANCE);

src/main/java/dev/overgrown/thaumaturge/client/overlay/AethericGogglesOverlay.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ private void renderAspectData(DrawContext context, AspectData data, int centerX,
8585
}
8686

8787
// Start position for drawing
88-
int startX = centerX - totalWidth / 2;
89-
int currentX = startX;
88+
int currentX = centerX - totalWidth / 2;
9089

9190
for (var entry : data.getMap().object2IntEntrySet()) {
9291
Identifier aspectId = entry.getKey();
Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
package dev.overgrown.thaumaturge.item;
22

33
import net.minecraft.client.item.TooltipContext;
4-
import net.minecraft.entity.Entity;
54
import net.minecraft.entity.EquipmentSlot;
65
import net.minecraft.entity.player.PlayerEntity;
7-
import net.minecraft.item.ArmorItem;
8-
import net.minecraft.item.ArmorMaterial;
6+
import net.minecraft.item.Equipment;
7+
import net.minecraft.item.Item;
98
import net.minecraft.item.ItemStack;
9+
import net.minecraft.sound.SoundEvent;
10+
import net.minecraft.sound.SoundEvents;
1011
import net.minecraft.text.Text;
1112
import net.minecraft.util.Formatting;
1213
import net.minecraft.world.World;
1314
import org.jetbrains.annotations.Nullable;
1415

1516
import java.util.List;
1617

17-
public class AethericGogglesItem extends ArmorItem {
18-
// Custom armor material with zero protection
19-
private static final ArmorMaterial AETHERIC_MATERIAL = new SimpleArmorMaterial("aetheric", 0, new int[]{0, 0, 0, 0}, 0, 0, 0);
20-
18+
public class AethericGogglesItem extends Item implements Equipment {
2119
public AethericGogglesItem() {
22-
super(AETHERIC_MATERIAL, Type.HELMET, new Settings().maxCount(1));
20+
super(new Settings().maxCount(1));
2321
}
2422

2523
@Override
@@ -28,20 +26,19 @@ public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> too
2826
tooltip.add(Text.translatable("item.thaumaturge.aetheric_goggles.tooltip").formatted(Formatting.GRAY));
2927
}
3028

31-
@Override
32-
public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) {
33-
super.inventoryTick(stack, world, entity, slot, selected);
34-
35-
// Only update when worn in helmet slot
36-
if (entity instanceof PlayerEntity player &&
37-
player.getEquippedStack(EquipmentSlot.HEAD).getItem() == this) {
38-
// Add any special effects when worn
39-
}
40-
}
41-
4229
public static boolean isWearingGoggles(PlayerEntity player) {
4330
if (player == null) return false;
4431
ItemStack headStack = player.getEquippedStack(EquipmentSlot.HEAD);
4532
return headStack.getItem() instanceof AethericGogglesItem;
4633
}
34+
35+
@Override
36+
public EquipmentSlot getSlotType() {
37+
return EquipmentSlot.HEAD;
38+
}
39+
40+
@Override
41+
public SoundEvent getEquipSound() {
42+
return SoundEvents.ITEM_ARMOR_EQUIP_LEATHER;
43+
}
4744
}

src/main/java/dev/overgrown/thaumaturge/item/SimpleArmorMaterial.java

Lines changed: 0 additions & 79 deletions
This file was deleted.

src/main/resources/assets/thaumaturge/lang/en_us.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
"key.thaumaturge.nonary": "Nonary Spell",
1212
"key.thaumaturge.denary": "Denary Spell",
1313

14+
"block.thaumaturge.vessel": "Vessel",
15+
1416
"item.thaumaturge.aspect_lens": "Aspect Lens",
1517
"item.thaumaturge.aspect_lens.tooltip": "Reveals the hidden aspects of items",
1618
"item.thaumaturge.aetheric_goggles": "Aetheric Goggles",

0 commit comments

Comments
 (0)