Patch entity networking

build.gradle

@@ -30,9 +30,18 @@ targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
-    maven { url 'https://libraries.minecraft.net/' }
-    maven { url 'https://www.dimdev.org/maven/' }
-    maven { url = 'https://repo.spongepowered.org/maven/' }
+    maven {
+        name = "Minecraft"
+        url = "https://libraries.minecraft.net/"
+    }
+    maven {
+        name = "Dimensional Development"
+        url = "https://www.dimdev.org/maven/"
+    }
+    maven {
+        name = "Sponge"
+        url = "https://repo.spongepowered.org/maven/"
+    }
 }
 
 dependencies {
@@ -59,9 +68,9 @@ mixin {
 }
 
 sourceSets {
-    main
     debug {
-        compileClasspath += main.compileClasspath
+        compileClasspath += main.compileClasspath + main.output
+        runtimeClasspath += main.runtimeClasspath
     }
 }
 

src/debug/java/org/dimdev/testmod/TestMod.java

@@ -7,7 +7,12 @@
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.MusicTicker;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.entity.RenderSprite;
 import net.minecraft.command.CommandSource;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
 import net.minecraft.fluid.FlowingFluid;
 import net.minecraft.fluid.Fluid;
 import net.minecraft.item.EnumDyeColor;
@@ -23,23 +28,29 @@
 import org.dimdev.rift.listener.*;
 import org.dimdev.rift.listener.client.AmbientMusicTypeProvider;
 import org.dimdev.rift.listener.client.ClientTickable;
+import org.dimdev.rift.listener.client.EntityRendererAdder;
 import org.dimdev.rift.listener.client.TextureAdder;
 import org.dimdev.rift.network.Message;
+import org.dimdev.testmod.entity.EntityGrenade;
+import org.dimdev.testmod.item.ItemGrenade;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Set;
 
 import static net.minecraft.init.SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP;
 
-public class TestMod implements BlockAdder, ItemAdder, FluidAdder, TextureAdder, PacketAdder, CommandAdder, ClientTickable, /*AmbientMusicTypeProvider,*/ DimensionTypeAdder, MessageAdder {
+public class TestMod implements BlockAdder, ItemAdder, FluidAdder, TextureAdder, PacketAdder, CommandAdder, ClientTickable, /*AmbientMusicTypeProvider,*/ DimensionTypeAdder, MessageAdder, EntityTypeAdder, EntityRendererAdder, EntityTrackerAdder {
+    public static EntityType<EntityGrenade> ENTITY_TYPE_GRENADE;
     private static final Logger LOGGER = LogManager.getLogger();
     public static final Block WHITE_BLOCK = new Block(Block.Builder.create(Material.ROCK));
     public static final Block TRANSLUCENT_WHITE_BLOCK = new BlockStainedGlass(EnumDyeColor.WHITE, Block.Builder.create(Material.GLASS));
     public static final FlowingFluid WHITE_FLUID = new WhiteFluid.Source();
     public static final FlowingFluid FLOWING_WHITE_FLUID = new WhiteFluid.Flowing();
     public static final BlockFlowingFluid BLOCK_WHITE_FLUID = new BlockFlowingFluid(WHITE_FLUID, Block.Builder.create(Material.WATER).doesNotBlockMovement().hardnessAndResistance(100F, 100F).variableOpacity());
-    public static final Item PACKET_TESTER = new ItemPacketTester(new Item.Builder());
+    public static final Item PACKET_TESTER = new ItemPacketTester(new Item.Builder().group(ItemGroup.TOOLS));
+    public static final Item GRENADE = new ItemGrenade(new Item.Builder().group(ItemGroup.COMBAT).maxStackSize(8));
     public static final MusicTicker.MusicType TEST_MUSIC = AmbientMusicTypeProvider.newMusicType("test", ENTITY_EXPERIENCE_ORB_PICKUP, 0, 0);
     private int clientTickCount = 0;
 
@@ -55,6 +66,7 @@ public void registerItems() {
         Item.registerItemBlock(WHITE_BLOCK, ItemGroup.BUILDING_BLOCKS);
         Item.registerItemBlock(TRANSLUCENT_WHITE_BLOCK, ItemGroup.BUILDING_BLOCKS);
         Item.registerItem(new ResourceLocation("testmod", "packet_tester"), PACKET_TESTER);
+        Item.register(new ResourceLocation("testmod", "grenade"), GRENADE);
     }
 
     @Override
@@ -108,5 +120,20 @@ public Set<? extends DimensionType> getDimensionTypes() {
     @Override
     public void registerMessages(RegistryNamespaced<ResourceLocation, Class<? extends Message>> registry) {
         registry.putObject(new ResourceLocation("testmod", "test_message"), TestMessage.class);
+
+    @Override
+    public void registerEntityTypes() {
+        ENTITY_TYPE_GRENADE = EntityType.register("testmod:grenade", EntityType.Builder.create(EntityGrenade.class, EntityGrenade::new));
+    }
+
+    @Override
+    public void addEntityRenderers(Map<Class<? extends Entity>, Render<? extends Entity>> entityRenderMap, RenderManager renderManager) {
+        entityRenderMap.put(EntityGrenade.class, new RenderSprite<>(renderManager, GRENADE, Minecraft.getMinecraft().getRenderItem()));
+    }
+
+    @Override
+    public void addEntityTrackerInfo(Map<EntityType, EntityTrackerInfo> entityTrackers) {
+        entityTrackers.put(ENTITY_TYPE_GRENADE, new EntityTrackerInfo(64, 20, true));
+        entityTrackers.put(EntityType.ARROW, new EntityTrackerInfo(128, 20, false)); //test substitution of vanilla trackers
     }
 }

src/debug/java/org/dimdev/testmod/entity/EntityGrenade.java

@@ -0,0 +1,31 @@
+package org.dimdev.testmod.entity;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.projectile.EntityThrowable;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.world.World;
+import org.dimdev.testmod.TestMod;
+
+public class EntityGrenade extends EntityThrowable {
+
+    public EntityGrenade(World world) {
+        super(TestMod.ENTITY_TYPE_GRENADE, world);
+    }
+
+    public EntityGrenade(World world, EntityLivingBase shooter) {
+        super(TestMod.ENTITY_TYPE_GRENADE, shooter, world);
+    }
+
+    public EntityGrenade(World world, double x, double y, double z) {
+        super(TestMod.ENTITY_TYPE_GRENADE, x, y, z, world);
+    }
+
+    @Override
+    protected void onImpact(RayTraceResult result) {
+        if(this.world.isRemote()) {
+            this.world.createExplosion(this, this.posX, this.posY, this.posZ, 12.0F, false);
+        }
+        this.setDead();
+    }
+
+}

src/debug/java/org/dimdev/testmod/item/ItemGrenade.java

@@ -0,0 +1,38 @@
+package org.dimdev.testmod.item;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.SoundEvents;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.StatList;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.world.World;
+import org.dimdev.testmod.entity.EntityGrenade;
+
+public class ItemGrenade extends Item {
+
+    public ItemGrenade(Builder builder) {
+        super(builder);
+    }
+
+    @Override
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+        ItemStack stack = player.getHeldItem(hand);
+        if (!player.capabilities.isCreativeMode) {
+            stack.shrink(1);
+        }
+
+        world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+        if (!world.isRemote) {
+            EntityGrenade grenade = new EntityGrenade(world, player);
+            grenade.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F);
+            world.spawnEntity(grenade);
+        }
+
+        player.addStat(StatList.ITEM_USED.get(this));
+        return new ActionResult<>(EnumActionResult.SUCCESS, stack);
+    }
+}

src/debug/resources/assets/testmod/lang/en_us.json

@@ -2,5 +2,6 @@
   "block.testmod.white_block": "White Block",
   "block.testmod.translucent_white_block": "Translucent White Block",
   "item.testmod.white_block": "White Block",
-  "item.testmod.translucent_white_block": "Translucent White Block"
+  "item.testmod.translucent_white_block": "Translucent White Block",
+  "item.testmod.grenade": "Grenade"
 }

src/debug/resources/assets/testmod/models/item/grenade.json

@@ -0,0 +1,3 @@
+{
+    "parent": "block/tnt"
+}

src/debug/resources/assets/testmod/models/item/packet_tester.json

@@ -0,0 +1,3 @@
+{
+    "parent": "item/bone"
+}

src/main/java/org/dimdev/rift/entity/EntityTrackerRegistry.java

@@ -0,0 +1,16 @@
+package org.dimdev.rift.entity;
+
+import net.minecraft.entity.EntityType;
+import org.dimdev.rift.listener.EntityTrackerAdder;
+import org.dimdev.riftloader.RiftLoader;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class EntityTrackerRegistry {
+    public static final Map<EntityType, EntityTrackerAdder.EntityTrackerInfo> TRACKER_INFO = new HashMap<>();
+
+    public static void buildTrackerInfo() {
+        RiftLoader.instance.getListeners(EntityTrackerAdder.class).forEach(trackerAdder -> trackerAdder.addEntityTrackerInfo(TRACKER_INFO));
+    }
+}

src/main/java/org/dimdev/rift/entity/IEntityExtraSpawnData.java

@@ -0,0 +1,13 @@
+package org.dimdev.rift.entity;
+
+import net.minecraft.network.PacketBuffer;
+
+/**
+ * used to de/serialize custom data on entity spawn
+ */
+public interface IEntityExtraSpawnData {
+
+    void read(PacketBuffer buffer) throws Exception;
+
+    void write(PacketBuffer buffer) throws Exception;
+}

src/main/java/org/dimdev/rift/listener/EntityTrackerAdder.java

@@ -0,0 +1,37 @@
+package org.dimdev.rift.listener;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
+
+import java.util.Map;
+
+@Deprecated //TODO make this a static register() call that is to be called when adding the type!
+public interface EntityTrackerAdder {
+
+    void addEntityTrackerInfo(Map<EntityType, EntityTrackerAdder.EntityTrackerInfo> entityTrackers);
+
+    class EntityTrackerInfo<T extends Entity> {
+
+        private final int trackingRange;
+        private final int updateFrequency;
+        private final boolean sendVelocityUpdates;
+
+        public EntityTrackerInfo(int trackingRange, int updateFrequency, boolean sendVelocityUpdates) {
+            this.trackingRange = trackingRange;
+            this.updateFrequency = updateFrequency;
+            this.sendVelocityUpdates = sendVelocityUpdates;
+        }
+
+        public int getTrackingRange() {
+            return trackingRange;
+        }
+
+        public int getUpdateFrequency() {
+            return updateFrequency;
+        }
+
+        public boolean shouldSendVelocityUpdates() {
+            return sendVelocityUpdates;
+        }
+    }
+}

src/main/java/org/dimdev/rift/listener/EntityTypeAdder.java

@@ -1,5 +1,6 @@
 package org.dimdev.rift.listener;
 
+@Deprecated
 public interface EntityTypeAdder {
     void registerEntityTypes();
 }

src/main/java/org/dimdev/rift/mixin/hook/MixinEntityTracker.java

@@ -0,0 +1,24 @@
+package org.dimdev.rift.mixin.hook;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityTracker;
+import org.dimdev.rift.entity.EntityTrackerRegistry;
+import org.dimdev.rift.listener.EntityTrackerAdder;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(EntityTracker.class)
+public class MixinEntityTracker {
+
+    @SuppressWarnings("ConstantConditions")
+    @Inject(method = "track", at = @At("HEAD"), cancellable = true)
+    public void trackEntity(Entity entityIn, CallbackInfo ci) {
+        if(EntityTrackerRegistry.TRACKER_INFO.containsKey(entityIn.getType())) {
+            EntityTrackerAdder.EntityTrackerInfo info = EntityTrackerRegistry.TRACKER_INFO.get(entityIn.getType());
+            ((EntityTracker) (Object) this).track(entityIn, info.getTrackingRange(), info.getUpdateFrequency(), info.shouldSendVelocityUpdates());
+            ci.cancel();
+        }
+    }
+}

src/main/java/org/dimdev/rift/mixin/hook/MixinEntityTrackerEntry.java

@@ -0,0 +1,35 @@
+package org.dimdev.rift.mixin.hook;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityTrackerEntry;
+import net.minecraft.entity.EntityType;
+import net.minecraft.network.EnumPacketDirection;
+import net.minecraft.network.Packet;
+import net.minecraft.util.ResourceLocation;
+import org.dimdev.rift.network.message.MessageSpawnEntity;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(EntityTrackerEntry.class)
+public class MixinEntityTrackerEntry {
+
+    @Shadow
+    @Final
+    private Entity trackedEntity;
+
+    @Inject(method = "createSpawnPacket", at = @At("INVOKE"), cancellable = true)
+    private void createCustomSpawnPacket(CallbackInfoReturnable<Packet<?>> info) {
+        if(!this.trackedEntity.isDead) {
+            EntityType type = this.trackedEntity.getType();
+            ResourceLocation typeName = EntityType.getId(type);
+            if(!typeName.getNamespace().equals("minecraft")) {
+                info.setReturnValue(new MessageSpawnEntity(this.trackedEntity).toPacket(EnumPacketDirection.CLIENTBOUND));
+            }
+        }
+    }
+
+}

src/main/java/org/dimdev/rift/mixin/hook/MixinEntityType.java

@@ -9,6 +9,7 @@
 import net.minecraft.world.World;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.dimdev.rift.entity.EntityTrackerRegistry;
 import org.dimdev.rift.listener.EntityTypeAdder;
 import org.dimdev.riftloader.RiftLoader;
 import org.spongepowered.asm.mixin.Final;
@@ -24,6 +25,7 @@ public abstract class MixinEntityType {
         for (EntityTypeAdder entityTypeAdder : RiftLoader.instance.getListeners(EntityTypeAdder.class)) {
             entityTypeAdder.registerEntityTypes();
         }
+        EntityTrackerRegistry.buildTrackerInfo();
     }
 
     @Mixin(EntityType.Builder.class)