hammer somewhat renders

RealYusufIsmail-Mc-Mods · Oct 17, 2023 · ffbb91e · ffbb91e
1 parent ecfc229
commit ffbb91e
Show file tree

Hide file tree

Showing 6 changed files with 944 additions and 947 deletions.
diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/ArmourAndToolsMod.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/ArmourAndToolsMod.kt
@@ -61,8 +61,8 @@ class ArmourAndToolsMod {
         // register entity renderers
         bus.addListener(ClientSetup::registerEntityRenders)
         // register click event
-        FORGE_BUS.addListener(ClientSetup::rightClickEmpty)
-        FORGE_BUS.addListener(ClientSetup::rightClickBlock)
+        FORGE_BUS.addListener(ClientSetup::leftClickBlock)
+        FORGE_BUS.addListener(ClientSetup::leftClickEmpty)
         FORGE_BUS.addListener(ClientSetup::clickEntity)
 
         FORGE_BUS.register(this)

diff --git a/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/client/ClientSetup.kt b/src/main/kotlin/io/github/realyusufismail/armourandtoolsmod/client/ClientSetup.kt
@@ -127,7 +127,7 @@ object ClientSetup {
             EntityTypeInit.MJOLNIR_THROWN_TRIDENT.get(), ::MjolnirItemRenderer)
     }
 
-    fun rightClickBlock(event: PlayerInteractEvent.RightClickBlock) {
+    fun leftClickBlock(event: PlayerInteractEvent.LeftClickBlock) {
         if (event.itemStack.item == ItemInit.MJOLNIR.get()) {
             fireLightningBolt(event)
         }
@@ -139,7 +139,7 @@ object ClientSetup {
         }
     }
 
-    fun rightClickEmpty(event: PlayerInteractEvent.RightClickEmpty) {
+    fun leftClickEmpty(event: PlayerInteractEvent.LeftClickEmpty) {
         if (event.itemStack.item == ItemInit.MJOLNIR.get()) {
             fireLightningBolt(event)
         }

diff --git a/...io/github/realyusufismail/armourandtoolsmod/client/renderer/hammer/MjolnirItemRenderer.kt b/...io/github/realyusufismail/armourandtoolsmod/client/renderer/hammer/MjolnirItemRenderer.kt
@@ -18,18 +18,18 @@
  */ 
 package io.github.realyusufismail.armourandtoolsmod.client.renderer.hammer
 
+import io.github.realyusufismail.armourandtoolsmod.ArmourAndToolsMod
 import io.github.realyusufismail.armourandtoolsmod.client.renderer.trident.ArmourToolsModTridentItemRenderer
 import io.github.realyusufismail.armourandtoolsmod.common.entity.ArmourToolsModTridentEntity
-import io.github.realyusufismail.armourandtoolsmod.core.init.ItemInit
 import net.minecraft.client.renderer.entity.EntityRendererProvider
-import net.minecraft.data.models.model.ModelLocationUtils
 import net.minecraft.resources.ResourceLocation
 
 class MjolnirItemRenderer(context: EntityRendererProvider.Context) :
     ArmourToolsModTridentItemRenderer(context) {
+    private val location: ResourceLocation =
+        ArmourAndToolsMod.getModIdAndName("textures/item/mjolnir/all.png")
 
     override fun getTextureLocation(pEntity: ArmourToolsModTridentEntity): ResourceLocation {
-        // this item consists of multiple textures, so we need to return the mode
-        return ModelLocationUtils.getModelLocation(ItemInit.MJOLNIR.get())
+        return location
     }
 }
diff --git a/...thub/realyusufismail/armourandtoolsmod/client/renderer/hammer/MjolnirItemRendererISTER.kt b/...thub/realyusufismail/armourandtoolsmod/client/renderer/hammer/MjolnirItemRendererISTER.kt
@@ -20,18 +20,18 @@ package io.github.realyusufismail.armourandtoolsmod.client.renderer.hammer
 
 import io.github.realyusufismail.armourandtoolsmod.ArmourAndToolsMod
 import io.github.realyusufismail.armourandtoolsmod.client.renderer.trident.ister.ArmourToolsModTridentRendererISTER
-import io.github.realyusufismail.armourandtoolsmod.core.init.ItemInit
 import net.minecraft.client.resources.model.ModelResourceLocation
-import net.minecraft.data.models.model.ModelLocationUtils
 import net.minecraft.resources.ResourceLocation
 
-class MjolnirItemRendererISTER() : ArmourToolsModTridentRendererISTER() {
+class MjolnirItemRendererISTER : ArmourToolsModTridentRendererISTER() {
+    private val location: ResourceLocation =
+        ArmourAndToolsMod.getModIdAndName("textures/item/mjolnir/all.png")
 
     override fun getModelResourceLocation(): ModelResourceLocation {
         return ModelResourceLocation(ArmourAndToolsMod.getModIdAndName("mjolnir"), "inventory")
     }
 
     override fun getTextureLocation(): ResourceLocation {
-        return ModelLocationUtils.getModelLocation(ItemInit.MJOLNIR.get())
+        return location
     }
 }