Merge branch 'hotfix/1.5.3'

Stumblinbear · Jan 13, 2018 · b5dbd6b · b5dbd6b
2 parents 8fe2fcd + b60ba35
commit b5dbd6b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-mod_version = 1.5.2
+mod_version = 1.5.3
 group = com.codingforcookies.betterrecords
 archivesBaseName = betterrecords
 

diff --git a/src/main/kotlin/com/codingforcookies/betterrecords/client/ClientProxy.kt b/src/main/kotlin/com/codingforcookies/betterrecords/client/ClientProxy.kt
@@ -34,10 +34,6 @@ class ClientProxy : CommonProxy() {
     override fun init(event: FMLInitializationEvent) {
         super.init(event)
 
-        MinecraftForge.EVENT_BUS.register(ClientRenderHandler)
-        MinecraftForge.EVENT_BUS.register(ClientTickHandler)
-        MinecraftForge.EVENT_BUS.register(RenderEventHandler)
-
         Item.REGISTRY
                 .filterIsInstance<ModItem>()
                 .forEach(ModItem::registerRender)

diff --git a/src/main/kotlin/com/codingforcookies/betterrecords/client/handler/ClientRenderHandler.kt b/src/main/kotlin/com/codingforcookies/betterrecords/client/handler/ClientRenderHandler.kt
@@ -1,21 +1,25 @@
 package com.codingforcookies.betterrecords.client.handler
 
+import com.codingforcookies.betterrecords.ID
 import com.codingforcookies.betterrecords.ModConfig
 import com.codingforcookies.betterrecords.client.sound.FileDownloader
 import com.codingforcookies.betterrecords.client.sound.SoundHandler
 import com.codingforcookies.betterrecords.extensions.glMatrix
 import com.codingforcookies.betterrecords.util.BetterUtils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution
+import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import org.lwjgl.opengl.GL11
 import java.awt.Color
 
+@Mod.EventBusSubscriber(modid = ID)
 object ClientRenderHandler {
 
     var strobeLinger = 0f
 
+    @JvmStatic
     @SubscribeEvent
     fun onClientRender(event: TickEvent.RenderTickEvent) {
         if (event.phase == TickEvent.Phase.END) {

diff --git a/src/main/kotlin/com/codingforcookies/betterrecords/client/handler/ClientTickHandler.kt b/src/main/kotlin/com/codingforcookies/betterrecords/client/handler/ClientTickHandler.kt
@@ -1,17 +1,21 @@
 package com.codingforcookies.betterrecords.client.handler
 
 import com.codingforcookies.betterrecords.BetterRecords
+import com.codingforcookies.betterrecords.ID
 import com.codingforcookies.betterrecords.ModConfig
 import com.codingforcookies.betterrecords.api.wire.IRecordWireHome
 import com.codingforcookies.betterrecords.client.sound.SoundHandler
 import net.minecraft.client.Minecraft
 import net.minecraft.util.SoundCategory
 import net.minecraft.util.math.BlockPos
+import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 
+@Mod.EventBusSubscriber(modid = ID)
 object ClientTickHandler {
 
+    @JvmStatic
     @SubscribeEvent
     fun showDisclaimer(event: TickEvent.ClientTickEvent) {
         if (event.phase == TickEvent.Phase.END) {
@@ -23,6 +27,7 @@ object ClientTickHandler {
         }
     }
 
+    @JvmStatic
     @SubscribeEvent
     fun incrementNowPlayingInt(event: TickEvent.ClientTickEvent) {
         if (event.phase == TickEvent.Phase.START) {
@@ -34,6 +39,7 @@ object ClientTickHandler {
         }
     }
 
+    @JvmStatic
     @SubscribeEvent
     fun updateVolumeBasedOnDistance(event: TickEvent.ClientTickEvent) {
         if (event.phase == TickEvent.Phase.START) {

diff --git a/src/main/kotlin/com/codingforcookies/betterrecords/client/handler/RenderEventHandler.kt b/src/main/kotlin/com/codingforcookies/betterrecords/client/handler/RenderEventHandler.kt
@@ -1,5 +1,6 @@
 package com.codingforcookies.betterrecords.client.handler
 
+import com.codingforcookies.betterrecords.ID
 import com.codingforcookies.betterrecords.ModConfig
 import com.codingforcookies.betterrecords.client.sound.SoundHandler
 import com.codingforcookies.betterrecords.extensions.glMatrix
@@ -8,11 +9,14 @@ import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.util.SoundCategory
 import net.minecraftforge.client.event.RenderWorldLastEvent
+import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.lwjgl.opengl.GL11
 
+@Mod.EventBusSubscriber(modid = ID)
 object RenderEventHandler {
 
+    @JvmStatic
     @SubscribeEvent
     fun onRenderEvent(event: RenderWorldLastEvent) {
         val mc = Minecraft.getMinecraft()

diff --git a/src/main/kotlin/com/codingforcookies/betterrecords/network/PacketRecordPlay.kt b/src/main/kotlin/com/codingforcookies/betterrecords/network/PacketRecordPlay.kt
@@ -71,7 +71,13 @@ class PacketRecordPlay @JvmOverloads constructor(
 
         val amount = buf.readInt()
         for (i in 1..amount) {
-            sounds.add(Sound.fromString(ByteBufUtils.readUTF8String(buf)))
+            sounds.add(Sound.fromString(ByteBufUtils.readUTF8String(buf)).apply {
+                this.x = this@PacketRecordPlay.pos.x
+                this.y = this@PacketRecordPlay.pos.y
+                this.z = this@PacketRecordPlay.pos.z
+                this.dimension = this@PacketRecordPlay.dimension
+                this.playRadius = this@PacketRecordPlay.playRadius
+            })
         }
 
         repeat = buf.readBoolean()