1.6.4 update

Fix package private field reference.
This commit is contained in:
Chicken Bones committed 2013-09-22 13:35:38 +10:00
1 parent 78c17917fc
commit 7adbd583bd
6 files changed
+16 -7

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/sh
MCVERSION="1.6.3"
MCVERSION="1.6.4"
VERSION="1.0.0.${BUILD_NUMBER}"
ASSETS="assets dependancies.info mcmod.info"
SOURCE="codechicken"
@@ -16,7 +16,7 @@ import codechicken.microblock.DefaultContent
import cpw.mods.fml.common.event.FMLPostInitializationEvent
import codechicken.microblock.ConfigContent
@Mod(modid = "ForgeMicroblock", acceptedMinecraftVersions = "[1.6.2]",
@Mod(modid = "ForgeMicroblock", acceptedMinecraftVersions = "[1.6.4]",
dependencies="required-after:ForgeMultipart;after:*", modLanguage="scala")
object MicroblockMod
{
+11 -2
View File
@@ -12,6 +12,8 @@ import java.util.{List => JList}
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.entity.player.EntityPlayerMP
import java.util.Arrays
import net.minecraft.server.management.PlayerInstance
import codechicken.lib.asm.ObfMapping
/**
* Static helper class for handling the unusual way that multipart tile entities load from nbt and send description packets
@@ -28,6 +30,13 @@ import java.util.Arrays
*/
object MultipartHelper
{
val f_playersInChunk = classOf[PlayerInstance].getDeclaredField(
new ObfMapping("net/minecraft/server/management/PlayerInstance", "playersInChunk", "Ljava/util/List;")
.toRuntime.s_name)
f_playersInChunk.setAccessible(true)
def playersInChunk(inst:PlayerInstance) = f_playersInChunk.get(inst).asInstanceOf[List[_]]
def createTileFromNBT(world:World, tag:NBTTagCompound):TileEntity = {
if(!tag.getString("id").equals("savedMultipart"))
return null
@@ -45,7 +54,7 @@ object MultipartHelper
def sendDescPackets(world:World, tiles:Iterable[TileEntity]) {
val map = LinkedListMultimap.create[Long, TileEntity]()
tiles.foreach(t => map.put(t.xCoord.toLong<<32|t.zCoord, t))
tiles.filter(_.isInstanceOf[TileMultipart]).foreach(t => map.put(t.xCoord.toLong<<32|t.zCoord, t))
val mgr = world.asInstanceOf[WorldServer].getPlayerManager
map.asMap.entrySet.foreach{e =>
@@ -53,7 +62,7 @@ object MultipartHelper
val c = world.getChunkFromBlockCoords((coord>>32).toInt, coord.toInt)
lazy val pkt = MultipartSPH.getDescPacket(c, e.getValue.iterator)
val inst = mgr.getOrCreateChunkWatcher(c.xPosition, c.zPosition, false)
if(!inst.playersInChunk.isEmpty)
if(!playersInChunk(inst).isEmpty)
inst.sendToAllPlayersWatchingChunk(pkt.toPacket)
}
}
@@ -12,7 +12,7 @@ import codechicken.multipart.MultiPartRegistry
import cpw.mods.fml.relauncher.SideOnly
import codechicken.lib.packet.PacketCustom.CustomTinyPacketHandler
@Mod(modid = "ForgeMultipart", acceptedMinecraftVersions = "[1.6.2]",
@Mod(modid = "ForgeMultipart", acceptedMinecraftVersions = "[1.6.4]",
modLanguage="scala")
@NetworkMod(clientSideRequired = true, serverSideRequired = true, tinyPacketHandler=classOf[CustomTinyPacketHandler])
object MultipartMod
@@ -9,7 +9,7 @@ import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
@Mod(modid = "McMultipart", acceptedMinecraftVersions="[1.6.2]")
@Mod(modid = "McMultipart", acceptedMinecraftVersions="[1.6.4]")
@NetworkMod(clientSideRequired = true, serverSideRequired = true, tinyPacketHandler=CustomTinyPacketHandler.class)
public class MinecraftMultipartMod
{
+1 -1
View File
@@ -3,5 +3,5 @@
"file": "CodeChickenLib-universal-@MCVERSION@-@[email protected]",
"dev": "CodeChickenLib-dev-@MCVERSION@-@[email protected]",
"class": "codechicken.lib.asm.ASMHelper",
"version": "1.0.0.33"
"version": "1.0.0.35"
}