remove wand entirely

mrsterner · Sep 17, 2024 · eeaba73 · eeaba73
1 parent 60cc5f8
commit eeaba73
Show file tree

Hide file tree

Showing 35 changed files with 561 additions and 1,349 deletions.
diff --git a/src/main/kotlin/dev/sterner/VoidBound.kt b/src/main/kotlin/dev/sterner/VoidBound.kt
@@ -31,7 +31,6 @@ object VoidBound : ModInitializer {
         VoidBoundParticleTypeRegistry.PARTICLES.register()
         VoidBoundMemoryTypeRegistry.MEMORY_TYPES.register()
         VoidBoundSensorTypeRegistry.SENSOR_TYPES.register()
-        VoidBoundWandFocusRegistry.WAND_FOCI.register()
         VoidBoundRiftTypeRegistry.RIFT_TYPES.register()
         VoidBoundMenuTypeRegistry.MENU_TYPES.register()
         VoidBoundStructureRegistry.STRUCTURES.register()

diff --git a/src/main/kotlin/dev/sterner/VoidBoundClient.kt b/src/main/kotlin/dev/sterner/VoidBoundClient.kt
@@ -6,7 +6,6 @@ import dev.sterner.VoidBound.id
 import dev.sterner.client.VoidBoundModelLoaderPlugin
 import dev.sterner.client.renderer.HallowedMonocleRenderer
 import dev.sterner.client.renderer.IchoriumCircletRenderer
-import dev.sterner.client.renderer.WandItemRenderer
 import dev.sterner.client.screen.OsmoticEnchanterScreen
 import dev.sterner.common.ItemAbilityHandler
 import dev.sterner.registry.*
@@ -47,15 +46,6 @@ object VoidBoundClient : ClientModInitializer {
             return@register v
         }
 
-        BuiltinItemRendererRegistry.INSTANCE.register(
-            VoidBoundItemRegistry.HALLOWED_GOLD_CAPPED_RUNEWOOD_WAND.get(),
-            WandItemRenderer("hallowed_gold_capped_runewood_wand")
-        )
-        BuiltinItemRendererRegistry.INSTANCE.register(
-            VoidBoundItemRegistry.SOUL_STAINED_STEEL_CAPPED_SOULWOOD_WAND.get(),
-            WandItemRenderer("soul_stained_steel_capped_soulwood_wand")
-        )
-
         BlockRenderLayerMap.INSTANCE.putBlocks(
             RenderType.cutout(),
             VoidBoundBlockRegistry.TEAR_OF_ENDER.get(),

diff --git a/src/main/kotlin/dev/sterner/api/wand/IWandFocus.kt b/src/main/kotlin/dev/sterner/api/wand/IWandFocus.kt
diff --git a/src/main/kotlin/dev/sterner/client/event/MalumCodexEvent.kt b/src/main/kotlin/dev/sterner/client/event/MalumCodexEvent.kt
@@ -441,27 +441,6 @@ object MalumCodexEvent {
                 )
         }
 
-        screen?.addEntry("hallowed_wand", -13, 5) { builder ->
-            builder.configureWidget {
-                it.setIcon(VoidBoundItemRegistry.HALLOWED_GOLD_CAPPED_RUNEWOOD_WAND.get()).setStyle(VOID)
-            }.addPage(HeadlineTextPage("hallowed_wand", "hallowed_wand.1"))
-                .addPage(
-                    SpiritInfusionPage.fromOutput(
-                        VoidBoundItemRegistry.HALLOWED_GOLD_CAPPED_RUNEWOOD_WAND.get()
-                    )
-                )
-                .addPage(
-                    SpiritInfusionPage.fromOutput(
-                        VoidBoundItemRegistry.SOUL_STAINED_STEEL_CAPPED_SOULWOOD_WAND.get()
-                    )
-                )
-                .addPage(
-                    SpiritInfusionPage.fromOutput(
-                        VoidBoundItemRegistry.CRYSTAL_FOCUS.get()
-                    )
-                )
-        }
-
         screen?.addEntry("fire_focus", -14, 5) { builder ->
             builder.configureWidget {
                 it.setIcon(VoidBoundItemRegistry.FIRE_FOCUS.get()).setStyle(DARK_VOID)

diff --git a/src/main/kotlin/dev/sterner/client/renderer/WandItemRenderer.kt b/src/main/kotlin/dev/sterner/client/renderer/WandItemRenderer.kt
diff --git a/src/main/kotlin/dev/sterner/client/screen/FocusSelectionScreen.kt b/src/main/kotlin/dev/sterner/client/screen/FocusSelectionScreen.kt
diff --git a/src/main/kotlin/dev/sterner/client/screen/widget/SelectFocusWidget.kt b/src/main/kotlin/dev/sterner/client/screen/widget/SelectFocusWidget.kt
diff --git a/src/main/kotlin/dev/sterner/common/blockentity/PortableHoleBlockEntity.kt b/src/main/kotlin/dev/sterner/common/blockentity/PortableHoleBlockEntity.kt
@@ -1,6 +1,6 @@
 package dev.sterner.common.blockentity
 
-import dev.sterner.common.item.focus.PortableHoleFocus
+import dev.sterner.common.item.focus.PortableHoleFocusItem
 import dev.sterner.registry.VoidBoundBlockEntityTypeRegistry
 import dev.sterner.registry.VoidBoundBlockRegistry
 import net.minecraft.core.BlockPos
@@ -56,7 +56,7 @@ class PortableHoleBlockEntity(pos: BlockPos, state: BlockState) : LodestoneBlock
         if (duration == maxDuration - 1 && distance > 1) {
             val nextPos = blockPos.relative(direction)
             if (owner != null) {
-                PortableHoleFocus.createHole(owner!!, level!!, nextPos, direction, distance - 1)
+                PortableHoleFocusItem.createHole(owner!!, level!!, nextPos, direction, distance - 1)
             }
         }
 

diff --git a/src/main/kotlin/dev/sterner/common/components/VoidBoundWorldComponent.kt b/src/main/kotlin/dev/sterner/common/components/VoidBoundWorldComponent.kt
@@ -3,10 +3,8 @@ package dev.sterner.common.components
 import dev.onyxstudios.cca.api.v3.component.sync.AutoSyncedComponent
 import dev.sterner.api.util.VoidBoundRenderUtils
 import dev.sterner.client.VoidBoundTokens
-import dev.sterner.common.item.WandItem
-import dev.sterner.common.item.focus.WardingFocus
+import dev.sterner.common.item.equipment.SealerItem
 import dev.sterner.registry.VoidBoundComponentRegistry
-import dev.sterner.registry.VoidBoundWandFocusRegistry
 import io.github.fabricators_of_create.porting_lib.event.common.BlockEvents
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext
 import net.minecraft.client.Minecraft
@@ -227,29 +225,21 @@ class VoidBoundWorldComponent(val level: Level) : AutoSyncedComponent {
             val poseStack = ctx.matrixStack()
             val localPlayer = Minecraft.getInstance().player
             if (localPlayer != null) {
-                if (localPlayer.mainHandItem.item is WandItem) {
-                    val wand = localPlayer.mainHandItem
-                    if (wand.tag?.contains("FocusName") == true) {
-                        val focusName = wand.tag?.getString("FocusName")
-                        val focus = VoidBoundWandFocusRegistry.WAND_FOCUS.getOptional(focusName?.let {
-                            ResourceLocation.tryParse(it)
-                        })
-                        if (focus.isPresent && focus.get() is WardingFocus) {
-                            val levelComp =
-                                VoidBoundComponentRegistry.VOID_BOUND_WORLD_COMPONENT.get(localPlayer.level())
-
-                            val poses: List<BlockPos> = levelComp.getAllPos(localPlayer)
-                            for (pos in poses) {
-                                VoidBoundRenderUtils.renderCubeAtPos(
-                                    camera,
-                                    poseStack,
-                                    pos,
-                                    VoidBoundTokens.wardBorder,
-                                    20,
-                                    20
-                                )
-                            }
-                        }
+                if (localPlayer.mainHandItem.item is SealerItem) {
+                    val sealer = localPlayer.mainHandItem
+                    val levelComp =
+                        VoidBoundComponentRegistry.VOID_BOUND_WORLD_COMPONENT.get(localPlayer.level())
+
+                    val poses: List<BlockPos> = levelComp.getAllPos(localPlayer)
+                    for (pos in poses) {
+                        VoidBoundRenderUtils.renderCubeAtPos(
+                            camera,
+                            poseStack,
+                            pos,
+                            VoidBoundTokens.wardBorder,
+                            20,
+                            20
+                        )
                     }
                 }
             }

diff --git a/src/main/kotlin/dev/sterner/common/entity/BoltEntity.kt b/src/main/kotlin/dev/sterner/common/entity/BoltEntity.kt
@@ -1,6 +1,6 @@
 package dev.sterner.common.entity
 
-import dev.sterner.common.item.focus.ShockFocus.Companion.spawnChargeParticles
+import dev.sterner.common.item.focus.ShockFocusItem
 import dev.sterner.registry.VoidBoundEntityTypeRegistry
 import net.minecraft.core.BlockPos
 import net.minecraft.nbt.CompoundTag
@@ -74,7 +74,7 @@ class BoltEntity(entityType: EntityType<BoltEntity>, level: Level) : Entity(enti
 
         val forwardPosition = this.position().add(forwardX, 0.0, forwardZ)
 
-        spawnChargeParticles(this.level(), this, forwardPosition, 0.5f)
+        ShockFocusItem.spawnChargeParticles(this.level(), this, forwardPosition, 0.5f)
 
         ambientTick--
         if (ambientTick < 0) {