mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-16 18:45:09 +00:00
Fix entity handling for ModLoader mods, thanks parachute mod!
This commit is contained in:
1 parent
6e01c59635
commit
c6f362b77f
14 files changed
+165
-22
No files matched your search
@@ -52,6 +52,7 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper;
|
|||||||
import cpw.mods.fml.common.Side;
|
import cpw.mods.fml.common.Side;
|
||||||
import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
|
import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
|
||||||
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||||
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
|
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
|
||||||
import cpw.mods.fml.common.registry.IThrowableEntity;
|
import cpw.mods.fml.common.registry.IThrowableEntity;
|
||||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||||
@@ -250,22 +251,41 @@ public class FMLClientHandler implements IFMLSidedHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Entity spawnEntityIntoClientWorld(Class<? extends Entity> cls, EntitySpawnPacket packet)
|
public Entity spawnEntityIntoClientWorld(EntityRegistration er, EntitySpawnPacket packet)
|
||||||
{
|
{
|
||||||
WorldClient wc = client.field_71441_e;
|
WorldClient wc = client.field_71441_e;
|
||||||
|
|
||||||
|
Class<? extends Entity> cls = er.getEntityClass();
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Entity entity = (Entity)(cls.getConstructor(World.class).newInstance(wc));
|
Entity entity;
|
||||||
|
if (er.hasCustomSpawning())
|
||||||
|
{
|
||||||
|
entity = er.doCustomSpawning(packet);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
entity = (Entity)(cls.getConstructor(World.class).newInstance(wc));
|
||||||
|
entity.field_70157_k = packet.entityId;
|
||||||
|
entity.func_70012_b(packet.scaledX, packet.scaledY, packet.scaledZ, packet.scaledYaw, packet.scaledPitch);
|
||||||
|
if (entity instanceof EntityLiving)
|
||||||
|
{
|
||||||
|
((EntityLiving)entity).field_70759_as = packet.scaledHeadYaw;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
entity.field_70118_ct = packet.rawX;
|
||||||
|
entity.field_70117_cu = packet.rawY;
|
||||||
|
entity.field_70116_cv = packet.rawZ;
|
||||||
|
|
||||||
if (entity instanceof IThrowableEntity)
|
if (entity instanceof IThrowableEntity)
|
||||||
{
|
{
|
||||||
Entity thrower = client.field_71439_g.field_70157_k == packet.throwerId ? client.field_71439_g : wc.func_73024_a(packet.throwerId);
|
Entity thrower = client.field_71439_g.field_70157_k == packet.throwerId ? client.field_71439_g : wc.func_73024_a(packet.throwerId);
|
||||||
((IThrowableEntity)entity).setThrower(thrower);
|
((IThrowableEntity)entity).setThrower(thrower);
|
||||||
}
|
}
|
||||||
|
|
||||||
entity.field_70118_ct = packet.rawX;
|
|
||||||
entity.field_70117_cu = packet.rawY;
|
|
||||||
entity.field_70116_cv = packet.rawZ;
|
|
||||||
|
|
||||||
Entity parts[] = entity.func_70021_al();
|
Entity parts[] = entity.func_70021_al();
|
||||||
if (parts != null)
|
if (parts != null)
|
||||||
@@ -277,13 +297,6 @@ public class FMLClientHandler implements IFMLSidedHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
entity.field_70157_k = packet.entityId;
|
|
||||||
entity.func_70012_b(packet.scaledX, packet.scaledY, packet.scaledZ, packet.scaledYaw, packet.scaledPitch);
|
|
||||||
|
|
||||||
if (entity instanceof EntityLiving)
|
|
||||||
{
|
|
||||||
((EntityLiving)entity).field_70759_as = packet.scaledHeadYaw;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (packet.metadata != null)
|
if (packet.metadata != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -21,13 +21,17 @@ import com.google.common.collect.Maps;
|
|||||||
import com.google.common.collect.Multimap;
|
import com.google.common.collect.Multimap;
|
||||||
import com.google.common.collect.Multimaps;
|
import com.google.common.collect.Multimaps;
|
||||||
|
|
||||||
|
import cpw.mods.fml.client.FMLClientHandler;
|
||||||
import cpw.mods.fml.client.registry.KeyBindingRegistry;
|
import cpw.mods.fml.client.registry.KeyBindingRegistry;
|
||||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||||
|
import cpw.mods.fml.common.FMLLog;
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import cpw.mods.fml.common.modloader.BaseModProxy;
|
import cpw.mods.fml.common.modloader.BaseModProxy;
|
||||||
import cpw.mods.fml.common.modloader.IModLoaderSidedHelper;
|
import cpw.mods.fml.common.modloader.IModLoaderSidedHelper;
|
||||||
import cpw.mods.fml.common.modloader.ModLoaderHelper;
|
import cpw.mods.fml.common.modloader.ModLoaderHelper;
|
||||||
import cpw.mods.fml.common.modloader.ModLoaderModContainer;
|
import cpw.mods.fml.common.modloader.ModLoaderModContainer;
|
||||||
|
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||||
|
|
||||||
public class ModLoaderClientHelper implements IModLoaderSidedHelper
|
public class ModLoaderClientHelper implements IModLoaderSidedHelper
|
||||||
{
|
{
|
||||||
@@ -48,6 +52,7 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper
|
|||||||
|
|
||||||
public static void handleFinishLoadingFor(ModLoaderModContainer mc, Minecraft game)
|
public static void handleFinishLoadingFor(ModLoaderModContainer mc, Minecraft game)
|
||||||
{
|
{
|
||||||
|
FMLLog.finer("Handling post startup activities for ModLoader mod %s", mc.getModId());
|
||||||
BaseMod mod = (BaseMod) mc.getMod();
|
BaseMod mod = (BaseMod) mc.getMod();
|
||||||
|
|
||||||
Map<Class<? extends Entity>, Render> renderers = Maps.newHashMap();
|
Map<Class<? extends Entity>, Render> renderers = Maps.newHashMap();
|
||||||
@@ -56,6 +61,7 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper
|
|||||||
|
|
||||||
for (Entry<Class<? extends Entity>, Render> e : renderers.entrySet())
|
for (Entry<Class<? extends Entity>, Render> e : renderers.entrySet())
|
||||||
{
|
{
|
||||||
|
FMLLog.finest("Registering ModLoader entity renderer %s as instance of %s", e.getKey().getName(), e.getValue().getClass().getName());
|
||||||
RenderingRegistry.registerEntityRenderingHandler(e.getKey(), e.getValue());
|
RenderingRegistry.registerEntityRenderingHandler(e.getKey(), e.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,4 +107,11 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper
|
|||||||
{
|
{
|
||||||
return ((net.minecraft.src.BaseMod)mod).getContainerGUI((EntityClientPlayerMP) player, ID, x, y, z);
|
return ((net.minecraft.src.BaseMod)mod).getContainerGUI((EntityClientPlayerMP) player, ID, x, y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Entity spawnEntity(BaseModProxy mod, EntitySpawnPacket input, EntityRegistration er)
|
||||||
|
{
|
||||||
|
return ((net.minecraft.src.BaseMod)mod).spawnEntity(er.getModEntityId(), client.field_71441_e, input.scaledX, input.scaledY, input.scaledZ);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -465,4 +465,20 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* Spawn the entity of the supplied type, if it is your mod's
|
||||||
|
* @param entityId
|
||||||
|
* @param world
|
||||||
|
* @param scaledX
|
||||||
|
* @param scaledY
|
||||||
|
* @param scaledZ
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@SideOnly(CLIENT)
|
||||||
|
public Entity spawnEntity(int entityId, World world, double scaledX, double scaledY, double scaledZ)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -113,6 +113,10 @@ public class ModLoader
|
|||||||
GameRegistry.addBiome(biome);
|
GameRegistry.addBiome(biome);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void addEntityTracker(BaseMod mod, Class<? extends Entity> entityClass, int entityTypeId, int updateRange, int updateInterval, boolean sendVelocityInfo)
|
||||||
|
{
|
||||||
|
ModLoaderHelper.buildEntityTracker(mod, entityClass, entityTypeId, updateRange, updateInterval, sendVelocityInfo);
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Add localization for the specified string
|
* Add localization for the specified string
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ import com.google.common.collect.Lists;
|
|||||||
|
|
||||||
import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
|
import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
|
||||||
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||||
import cpw.mods.fml.common.registry.TickRegistry;
|
import cpw.mods.fml.common.registry.TickRegistry;
|
||||||
import cpw.mods.fml.server.FMLServerHandler;
|
import cpw.mods.fml.server.FMLServerHandler;
|
||||||
|
|
||||||
@@ -333,9 +334,9 @@ public class FMLCommonHandler
|
|||||||
sidedDelegate.showGuiScreen(clientGuiElement);
|
sidedDelegate.showGuiScreen(clientGuiElement);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Entity spawnEntityIntoClientWorld(Class<? extends Entity> cls, EntitySpawnPacket entitySpawnPacket)
|
public Entity spawnEntityIntoClientWorld(EntityRegistration registration, EntitySpawnPacket entitySpawnPacket)
|
||||||
{
|
{
|
||||||
return sidedDelegate.spawnEntityIntoClientWorld(cls, entitySpawnPacket);
|
return sidedDelegate.spawnEntityIntoClientWorld(registration, entitySpawnPacket);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void adjustEntityLocationOnClient(EntitySpawnAdjustmentPacket entitySpawnAdjustmentPacket)
|
public void adjustEntityLocationOnClient(EntitySpawnAdjustmentPacket entitySpawnAdjustmentPacket)
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import net.minecraft.src.Entity;
|
|||||||
import net.minecraft.src.Packet;
|
import net.minecraft.src.Packet;
|
||||||
import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
|
import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
|
||||||
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||||
|
|
||||||
public interface IFMLSidedHandler
|
public interface IFMLSidedHandler
|
||||||
{
|
{
|
||||||
@@ -18,7 +19,7 @@ public interface IFMLSidedHandler
|
|||||||
|
|
||||||
void showGuiScreen(Object clientGuiElement);
|
void showGuiScreen(Object clientGuiElement);
|
||||||
|
|
||||||
Entity spawnEntityIntoClientWorld(Class<? extends Entity> entityClass, EntitySpawnPacket packet);
|
Entity spawnEntityIntoClientWorld(EntityRegistration registration, EntitySpawnPacket packet);
|
||||||
|
|
||||||
void adjustEntityLocationOnClient(EntitySpawnAdjustmentPacket entitySpawnAdjustmentPacket);
|
void adjustEntityLocationOnClient(EntitySpawnAdjustmentPacket entitySpawnAdjustmentPacket);
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ package cpw.mods.fml.common.modloader;
|
|||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
import net.minecraft.src.Entity;
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
import net.minecraft.src.GuiScreen;
|
import net.minecraft.src.GuiScreen;
|
||||||
import net.minecraft.src.IInventory;
|
import net.minecraft.src.IInventory;
|
||||||
@@ -24,6 +25,7 @@ import net.minecraft.src.NetHandler;
|
|||||||
import net.minecraft.src.NetworkManager;
|
import net.minecraft.src.NetworkManager;
|
||||||
import net.minecraft.src.Packet250CustomPayload;
|
import net.minecraft.src.Packet250CustomPayload;
|
||||||
import net.minecraft.src.World;
|
import net.minecraft.src.World;
|
||||||
|
import net.minecraft.src.WorldClient;
|
||||||
import cpw.mods.fml.common.Side;
|
import cpw.mods.fml.common.Side;
|
||||||
import cpw.mods.fml.common.TickType;
|
import cpw.mods.fml.common.TickType;
|
||||||
import cpw.mods.fml.common.asm.SideOnly;
|
import cpw.mods.fml.common.asm.SideOnly;
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
package cpw.mods.fml.common.modloader;
|
package cpw.mods.fml.common.modloader;
|
||||||
|
|
||||||
|
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||||
|
import net.minecraft.src.Entity;
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
|
|
||||||
public interface IModLoaderSidedHelper
|
public interface IModLoaderSidedHelper
|
||||||
@@ -9,4 +12,6 @@ public interface IModLoaderSidedHelper
|
|||||||
|
|
||||||
Object getClientGui(BaseModProxy mod, EntityPlayer player, int iD, int x, int y, int z);
|
Object getClientGui(BaseModProxy mod, EntityPlayer player, int iD, int x, int y, int z);
|
||||||
|
|
||||||
|
Entity spawnEntity(BaseModProxy mod, EntitySpawnPacket input, EntityRegistration registration);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package cpw.mods.fml.common.modloader;
|
||||||
|
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
|
import com.google.common.base.Function;
|
||||||
|
|
||||||
|
import cpw.mods.fml.client.FMLClientHandler;
|
||||||
|
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||||
|
|
||||||
|
import net.minecraft.src.Entity;
|
||||||
|
|
||||||
|
public class ModLoaderEntitySpawnCallback implements Function<EntitySpawnPacket, Entity>
|
||||||
|
{
|
||||||
|
|
||||||
|
private BaseModProxy mod;
|
||||||
|
private EntityRegistration registration;
|
||||||
|
|
||||||
|
public ModLoaderEntitySpawnCallback(BaseModProxy mod, EntityRegistration er)
|
||||||
|
{
|
||||||
|
this.mod = mod;
|
||||||
|
this.registration = er;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Entity apply(EntitySpawnPacket input)
|
||||||
|
{
|
||||||
|
return ModLoaderHelper.sidedHelper.spawnEntity(mod, input, registration);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,10 +17,13 @@ package cpw.mods.fml.common.modloader;
|
|||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
|
|
||||||
|
import net.minecraft.src.BaseMod;
|
||||||
import net.minecraft.src.Container;
|
import net.minecraft.src.Container;
|
||||||
|
import net.minecraft.src.Entity;
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.common.ICraftingHandler;
|
import cpw.mods.fml.common.ICraftingHandler;
|
||||||
@@ -34,6 +37,8 @@ import cpw.mods.fml.common.network.IConnectionHandler;
|
|||||||
import cpw.mods.fml.common.network.IGuiHandler;
|
import cpw.mods.fml.common.network.IGuiHandler;
|
||||||
import cpw.mods.fml.common.network.IPacketHandler;
|
import cpw.mods.fml.common.network.IPacketHandler;
|
||||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author cpw
|
* @author cpw
|
||||||
@@ -151,4 +156,13 @@ public class ModLoaderHelper
|
|||||||
{
|
{
|
||||||
return new ModLoaderDispenseHelper(mod);
|
return new ModLoaderDispenseHelper(mod);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public static void buildEntityTracker(BaseModProxy mod, Class<? extends Entity> entityClass, int entityTypeId, int updateRange, int updateInterval,
|
||||||
|
boolean sendVelocityInfo)
|
||||||
|
{
|
||||||
|
EntityRegistration er = EntityRegistry.registerModLoaderEntity(mod, entityClass, entityTypeId, updateRange, updateInterval, sendVelocityInfo);
|
||||||
|
er.setCustomSpawning(new ModLoaderEntitySpawnCallback(mod, er));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -51,6 +51,7 @@ import cpw.mods.fml.common.discovery.ASMDataTable.ASMData;
|
|||||||
import cpw.mods.fml.common.discovery.ContainerType;
|
import cpw.mods.fml.common.discovery.ContainerType;
|
||||||
import cpw.mods.fml.common.event.FMLConstructionEvent;
|
import cpw.mods.fml.common.event.FMLConstructionEvent;
|
||||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||||
|
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
|
||||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
import cpw.mods.fml.common.network.FMLNetworkHandler;
|
import cpw.mods.fml.common.network.FMLNetworkHandler;
|
||||||
@@ -553,6 +554,12 @@ public class ModLoaderModContainer implements ModContainer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Subscribe
|
||||||
|
public void loadComplete(FMLLoadCompleteEvent complete)
|
||||||
|
{
|
||||||
|
ModLoaderHelper.finishModLoading(this);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ArtifactVersion getProcessedVersion()
|
public ArtifactVersion getProcessedVersion()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ public class EntitySpawnPacket extends FMLPacket
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Entity entity = FMLCommonHandler.instance().spawnEntityIntoClientWorld(cls, this);
|
Entity entity = FMLCommonHandler.instance().spawnEntityIntoClientWorld(registration, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -4,6 +4,7 @@ import java.util.BitSet;
|
|||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import net.minecraft.src.BiomeGenBase;
|
import net.minecraft.src.BiomeGenBase;
|
||||||
@@ -14,6 +15,7 @@ import net.minecraft.src.EntityTracker;
|
|||||||
import net.minecraft.src.EnumCreatureType;
|
import net.minecraft.src.EnumCreatureType;
|
||||||
import net.minecraft.src.SpawnListEntry;
|
import net.minecraft.src.SpawnListEntry;
|
||||||
|
|
||||||
|
import com.google.common.base.Function;
|
||||||
import com.google.common.collect.ArrayListMultimap;
|
import com.google.common.collect.ArrayListMultimap;
|
||||||
import com.google.common.collect.BiMap;
|
import com.google.common.collect.BiMap;
|
||||||
import com.google.common.collect.HashBiMap;
|
import com.google.common.collect.HashBiMap;
|
||||||
@@ -24,10 +26,11 @@ import cpw.mods.fml.common.FMLCommonHandler;
|
|||||||
import cpw.mods.fml.common.FMLLog;
|
import cpw.mods.fml.common.FMLLog;
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import cpw.mods.fml.common.ModContainer;
|
import cpw.mods.fml.common.ModContainer;
|
||||||
|
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||||
|
|
||||||
public class EntityRegistry
|
public class EntityRegistry
|
||||||
{
|
{
|
||||||
|
|
||||||
public class EntityRegistration
|
public class EntityRegistration
|
||||||
{
|
{
|
||||||
private Class<? extends Entity> entityClass;
|
private Class<? extends Entity> entityClass;
|
||||||
@@ -37,6 +40,7 @@ public class EntityRegistry
|
|||||||
private int trackingRange;
|
private int trackingRange;
|
||||||
private int updateFrequency;
|
private int updateFrequency;
|
||||||
private boolean sendsVelocityUpdates;
|
private boolean sendsVelocityUpdates;
|
||||||
|
private Function<EntitySpawnPacket, Entity> customSpawnCallback;
|
||||||
public EntityRegistration(ModContainer mc, Class<? extends Entity> entityClass, String entityName, int id, int trackingRange, int updateFrequency, boolean sendsVelocityUpdates)
|
public EntityRegistration(ModContainer mc, Class<? extends Entity> entityClass, String entityName, int id, int trackingRange, int updateFrequency, boolean sendsVelocityUpdates)
|
||||||
{
|
{
|
||||||
this.container = mc;
|
this.container = mc;
|
||||||
@@ -63,10 +67,6 @@ public class EntityRegistry
|
|||||||
{
|
{
|
||||||
return modId;
|
return modId;
|
||||||
}
|
}
|
||||||
public int getModId()
|
|
||||||
{
|
|
||||||
return modId;
|
|
||||||
}
|
|
||||||
public int getTrackingRange()
|
public int getTrackingRange()
|
||||||
{
|
{
|
||||||
return trackingRange;
|
return trackingRange;
|
||||||
@@ -79,6 +79,18 @@ public class EntityRegistry
|
|||||||
{
|
{
|
||||||
return sendsVelocityUpdates;
|
return sendsVelocityUpdates;
|
||||||
}
|
}
|
||||||
|
public boolean hasCustomSpawning()
|
||||||
|
{
|
||||||
|
return customSpawnCallback != null;
|
||||||
|
}
|
||||||
|
public Entity doCustomSpawning(EntitySpawnPacket packet) throws Exception
|
||||||
|
{
|
||||||
|
return customSpawnCallback.apply(packet);
|
||||||
|
}
|
||||||
|
public void setCustomSpawning(Function<EntitySpawnPacket, Entity> callable)
|
||||||
|
{
|
||||||
|
this.customSpawnCallback = callable;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final EntityRegistry INSTANCE = new EntityRegistry();
|
private static final EntityRegistry INSTANCE = new EntityRegistry();
|
||||||
@@ -285,4 +297,28 @@ public class EntityRegistry
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* DO NOT USE THIS METHOD
|
||||||
|
*
|
||||||
|
* @param entityClass
|
||||||
|
* @param entityTypeId
|
||||||
|
* @param updateRange
|
||||||
|
* @param updateInterval
|
||||||
|
* @param sendVelocityInfo
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
public static EntityRegistration registerModLoaderEntity(Object mod, Class<? extends Entity> entityClass, int entityTypeId, int updateRange, int updateInterval,
|
||||||
|
boolean sendVelocityInfo)
|
||||||
|
{
|
||||||
|
String entityName = (String) EntityList.field_75626_c.get(entityClass);
|
||||||
|
if (entityName == null)
|
||||||
|
{
|
||||||
|
throw new IllegalArgumentException(String.format("The ModLoader mod %s has tried to register an entity tracker for a non-existent entity type %s", Loader.instance().activeModContainer().getModId(), entityClass.getCanonicalName()));
|
||||||
|
}
|
||||||
|
instance().doModEntityRegistration(entityClass, entityName, entityTypeId, mod, updateRange, updateInterval, sendVelocityInfo);
|
||||||
|
return instance().entityClassRegistrations.get(entityClass);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -25,6 +25,7 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper;
|
|||||||
import cpw.mods.fml.common.Side;
|
import cpw.mods.fml.common.Side;
|
||||||
import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
|
import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
|
||||||
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
import cpw.mods.fml.common.network.EntitySpawnPacket;
|
||||||
|
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
|
||||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -133,7 +134,7 @@ public class FMLServerHandler implements IFMLSidedHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Entity spawnEntityIntoClientWorld(Class<? extends Entity> entityClass, EntitySpawnPacket packet)
|
public Entity spawnEntityIntoClientWorld(EntityRegistration er, EntitySpawnPacket packet)
|
||||||
{
|
{
|
||||||
// NOOP
|
// NOOP
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
Reference in new issue
Block a user