Update to Forge 14.23.4.2705

gradle.properties

@@ -1,5 +1,5 @@
 mod_version=0.11.5
 next_mod_version=0.12
 mc_ver=1.12.2
-forge_ver=14.23.2.2611
+forge_ver=14.23.4.2705
 mcp_mappings=snapshot_20171003

src/main/java/openmods/OpenMods.java

@@ -70,7 +70,7 @@ public class OpenMods {
 	public static final String MODID = "openmods";
 	public static final String MODNAME = "OpenModsLib";
 	public static final String VERSION = "$LIB-VERSION$";
-	public static final String DEPENDENCIES = "required:forge@[14.23.2.2611,);required-after:openmodscore";
+	public static final String DEPENDENCIES = "required:forge@[14.23.4.2705,);required-after:openmodscore";
 	public static final String GUI_FACTORY = "openmods.GuiFactory";
 	public static final String UPDATE_JSON = "http://openmods.info/versions/openmodslib.json";
 	public static final String CERTIFICATE_FINGERPRINT = "d2a9a8e8440196e26a268d1f3ddc01b2e9c572a5";

src/main/java/openmods/config/game/GameRegistryObjectsProvider.java

@@ -389,18 +389,14 @@ public void visit(final Block block, RegisterBlock annotation) {
 						setBlockPrefixedId(annotation.unlocalizedName(), id, langDecorator, block::setUnlocalizedName);
 
 						if (teClass != null) {
-							final String teName = new ResourceLocation(modId, id).toString();
-							GameRegistry.registerTileEntity(teClass, teName);
-
+							GameRegistry.registerTileEntity(teClass, new ResourceLocation(modId, id));
 							registerFixer(teClass);
 						}
 
 						if (block instanceof IRegisterableBlock) ((IRegisterableBlock)block).setupBlock(modContainer, id, teClass, itemBlock);
 
 						for (RegisterTileEntity te : annotation.tileEntities()) {
-							final String teName = new ResourceLocation(modId, te.name()).toString();
-							GameRegistry.registerTileEntity(te.cls(), teName);
-
+							GameRegistry.registerTileEntity(te.cls(), new ResourceLocation(modId, te.name()));
 							registerFixer(te.cls());
 						}
 

src/main/java/openmods/events/network/BlockEventPacket.java

@@ -5,7 +5,7 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import openmods.network.DimCoord;
+import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
 import openmods.network.event.NetworkEvent;
 import openmods.network.event.NetworkEventManager;
 import openmods.utils.WorldUtils;
@@ -46,8 +46,8 @@ public void sendToWatchers() {
 		NetworkEventManager.dispatcher().senders.block.sendMessage(this, getDimCoords());
 	}
 
-	public DimCoord getDimCoords() {
-		return new DimCoord(dimension, blockPos);
+	public TargetPoint getDimCoords() {
+		return new TargetPoint(dimension, blockPos.getX(), blockPos.getY(), blockPos.getZ(), 0);
 	}
 
 	public World getWorld() {

src/main/java/openmods/network/Dispatcher.java

@@ -8,7 +8,6 @@
 import net.minecraftforge.fml.common.network.FMLOutboundHandler.OutboundTarget;
 import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraftforge.fml.relauncher.Side;
-import openmods.network.senders.ExtPacketSenderFactory;
 import openmods.network.senders.FmlPacketSenderFactory;
 import openmods.network.senders.IPacketSender;
 import openmods.network.senders.ITargetedPacketSender;
@@ -38,9 +37,9 @@ public class Senders {
 
 		public final ITargetedPacketSender<TargetPoint> point = FmlPacketSenderFactory.createPointSender(serverChannel());
 
-		public final ITargetedPacketSender<DimCoord> block = ExtPacketSenderFactory.createBlockSender(serverChannel());
+		public final ITargetedPacketSender<TargetPoint> block = FmlPacketSenderFactory.createBlockTrackersSender(serverChannel());
 
-		public final ITargetedPacketSender<Entity> entity = ExtPacketSenderFactory.createEntitySender(serverChannel());
+		public final ITargetedPacketSender<Entity> entity = FmlPacketSenderFactory.createEntityTrackersSender(serverChannel());
 
 		public List<Object> serialize(Object msg) {
 			nowhere.sendMessage(msg);

src/main/java/openmods/network/senders/ExtPacketSenderFactory.java

@@ -2,14 +2,10 @@
 
 import io.netty.channel.Channel;
 import java.util.Collection;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.fml.common.network.FMLOutboundHandler;
-import openmods.network.DimCoord;
 import openmods.network.ExtendedOutboundHandler;
 import openmods.network.IPacketTargetSelector;
-import openmods.network.targets.SelectChunkWatchers;
-import openmods.network.targets.SelectEntityWatchers;
 import openmods.network.targets.SelectMultiplePlayers;
 
 public class ExtPacketSenderFactory {
@@ -18,14 +14,6 @@ public static <T> ITargetedPacketSender<T> createSender(Channel channel, IPacket
 		return new ExtTargetedPacketSender<>(channel, selector);
 	}
 
-	public static ITargetedPacketSender<DimCoord> createBlockSender(Channel channel) {
-		return createSender(channel, SelectChunkWatchers.INSTANCE);
-	}
-
-	public static ITargetedPacketSender<Entity> createEntitySender(Channel channel) {
-		return createSender(channel, SelectEntityWatchers.INSTANCE);
-	}
-
 	public static ITargetedPacketSender<Collection<EntityPlayerMP>> createMultiplePlayersSender(Channel channel) {
 		return createSender(channel, SelectMultiplePlayers.INSTANCE);
 	}

src/main/java/openmods/network/senders/FmlPacketSenderFactory.java

@@ -1,6 +1,7 @@
 package openmods.network.senders;
 
 import io.netty.channel.Channel;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.common.network.FMLOutboundHandler;
 import net.minecraftforge.fml.common.network.FMLOutboundHandler.OutboundTarget;
@@ -20,6 +21,14 @@ public static ITargetedPacketSender<TargetPoint> createPointSender(Channel chann
 		return new FmlTargetedPacketSender<>(channel, OutboundTarget.ALLAROUNDPOINT);
 	}
 
+	public static ITargetedPacketSender<TargetPoint> createBlockTrackersSender(Channel channel) {
+		return new FmlTargetedPacketSender<>(channel, OutboundTarget.TRACKING_POINT);
+	}
+
+	public static ITargetedPacketSender<Entity> createEntityTrackersSender(Channel channel) {
+		return new FmlTargetedPacketSender<>(channel, OutboundTarget.TRACKING_ENTITY);
+	}
+
 	public static IPacketSender createSender(Channel channel, OutboundTarget target) {
 		return new FmlPacketSender(channel, target);
 	}

src/main/java/openmods/tileentity/OpenTileEntity.java

@@ -11,14 +11,14 @@
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
 import openmods.api.IInventoryCallback;
 import openmods.block.BlockRotationMode;
 import openmods.block.IBlockRotationMode;
 import openmods.block.OpenBlock;
 import openmods.geometry.LocalDirections;
 import openmods.geometry.Orientation;
 import openmods.inventory.GenericInventory;
-import openmods.network.DimCoord;
 import openmods.network.rpc.IRpcTarget;
 import openmods.network.rpc.IRpcTargetProvider;
 import openmods.network.rpc.RpcCallDispatcher;
@@ -32,8 +32,8 @@ public abstract class OpenTileEntity extends TileEntity implements IRpcTargetPro
 	/** Place for TE specific setup. Called once upon creation */
 	public void setup() {}
 
-	public DimCoord getDimCoords() {
-		return new DimCoord(world.provider.getDimension(), pos);
+	public TargetPoint getDimCoords() {
+		return new TargetPoint(world.provider.getDimension(), pos.getX(), pos.getY(), pos.getZ(), 0);
 	}
 
 	public Orientation getOrientation() {

src/main/java/openmods/utils/NetUtils.java

@@ -1,13 +1,11 @@
 package openmods.utils;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import java.util.Set;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityTracker;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.management.PlayerChunkMapEntry;
 import net.minecraft.util.IThreadListener;
@@ -35,15 +33,10 @@ public static Set<EntityPlayerMP> getPlayersWatchingEntity(WorldServer server, E
 	public static Set<EntityPlayerMP> getPlayersWatchingChunk(WorldServer world, int chunkX, int chunkZ) {
 		final PlayerChunkMapEntry playerChunkMap = world.getPlayerChunkMap().getEntry(chunkX, chunkZ);
 
-		final Set<EntityPlayerMP> playerList = Sets.newHashSet();
-		if (playerChunkMap == null || !playerChunkMap.isSentToPlayers())
-			return playerList;
+		if (playerChunkMap == null)
+			return ImmutableSet.of();
 
-		for (EntityPlayer o : world.playerEntities) {
-			EntityPlayerMP player = (EntityPlayerMP)o;
-			if (playerChunkMap.containsPlayer(player)) playerList.add(player);
-		}
-		return playerList;
+		return ImmutableSet.copyOf(playerChunkMap.getWatchingPlayers());
 	}
 
 	public static Set<EntityPlayerMP> getPlayersWatchingBlock(WorldServer world, int blockX, int blockZ) {

src/test/java/openmods/model/EvalModelTest.java

@@ -592,7 +592,7 @@ public void testDirectApply() {
 		final ClipStub clipStub = new ClipStub();
 		final IJointClip jointClipMock = clipStub.jointClipMock;
 
-		final TRSRTransformation transform = new TRSRTransformation(EnumFacing.NORTH);
+		final TRSRTransformation transform = TRSRTransformation.from(EnumFacing.NORTH);
 		Mockito.when(jointClipMock.apply(Matchers.anyFloat())).thenReturn(transform);
 
 		final float param = 1.3f;
@@ -612,7 +612,7 @@ public void testVarApply() {
 		final ClipStub clipStub = new ClipStub();
 		final IJointClip jointClipMock = clipStub.jointClipMock;
 
-		final TRSRTransformation transform = new TRSRTransformation(EnumFacing.NORTH);
+		final TRSRTransformation transform = TRSRTransformation.from(EnumFacing.NORTH);
 		Mockito.when(jointClipMock.apply(Matchers.anyFloat())).thenReturn(transform);
 
 		final TRSRTransformation result = factory.createEvaluator(clips("clip", clipStub)).evaluate(DUMMY_JOINT, NO_ARGS);
@@ -630,7 +630,7 @@ public void testConstApply() {
 		final ClipStub clipStub = new ClipStub();
 		final IJointClip jointClipMock = clipStub.jointClipMock;
 
-		final TRSRTransformation transform = new TRSRTransformation(EnumFacing.NORTH);
+		final TRSRTransformation transform = TRSRTransformation.from(EnumFacing.NORTH);
 		Mockito.when(jointClipMock.apply(Matchers.anyFloat())).thenReturn(transform);
 
 		final TRSRTransformation result = factory.createEvaluator(clips("clip", clipStub)).evaluate(DUMMY_JOINT, NO_ARGS);
@@ -648,7 +648,7 @@ public void testArithmeticsVarApply() {
 		final ClipStub clipStub = new ClipStub();
 		final IJointClip jointClipMock = clipStub.jointClipMock;
 
-		final TRSRTransformation transform = new TRSRTransformation(EnumFacing.NORTH);
+		final TRSRTransformation transform = TRSRTransformation.from(EnumFacing.NORTH);
 		Mockito.when(jointClipMock.apply(Matchers.anyFloat())).thenReturn(transform);
 
 		final TRSRTransformation result = factory.createEvaluator(clips("clip", clipStub))
@@ -669,8 +669,8 @@ public void testDoubleApply() {
 		final ClipStub clipStub = new ClipStub();
 		final IJointClip jointClipMock = clipStub.jointClipMock;
 
-		final TRSRTransformation transform1 = new TRSRTransformation(EnumFacing.NORTH);
-		final TRSRTransformation transform2 = new TRSRTransformation(EnumFacing.WEST);
+		final TRSRTransformation transform1 = TRSRTransformation.from(EnumFacing.NORTH);
+		final TRSRTransformation transform2 = TRSRTransformation.from(EnumFacing.WEST);
 		Mockito.when(jointClipMock.apply(1.4f)).thenReturn(transform1);
 		Mockito.when(jointClipMock.apply(2.1f)).thenReturn(transform2);
 
@@ -695,8 +695,8 @@ public void testSeparateClipsApply() {
 		final ClipStub clipStub2 = new ClipStub();
 		final IJointClip jointClipMock2 = clipStub2.jointClipMock;
 
-		final TRSRTransformation transform1 = new TRSRTransformation(EnumFacing.EAST);
-		final TRSRTransformation transform2 = new TRSRTransformation(EnumFacing.UP);
+		final TRSRTransformation transform1 = TRSRTransformation.from(EnumFacing.EAST);
+		final TRSRTransformation transform2 = TRSRTransformation.from(EnumFacing.UP);
 		Mockito.when(jointClipMock1.apply(Matchers.anyFloat())).thenReturn(transform1);
 		Mockito.when(jointClipMock2.apply(Matchers.anyFloat())).thenReturn(transform2);