mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Apply various common one-to-one replacements
More work on common too. network package now done.
This commit is contained in:
1 parent
a0114b5112
commit
a80f724cc2
189 files changed
+1586
-1634
No files matched your search
@@ -31,6 +31,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.pathfinding.PathNavigateGround;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.tileentity.TileEntityFurnace;
|
||||
import net.minecraft.util.DamageSource;
|
||||
@@ -88,6 +89,12 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
prevPosZ = z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PathNavigateGround getNavigator()
|
||||
{
|
||||
return (PathNavigateGround)navigator;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void applyEntityAttributes()
|
||||
{
|
||||
@@ -304,7 +311,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
{
|
||||
setFollowing(false);
|
||||
|
||||
if(worldObj.provider.dimensionId != homeLocation.dimensionId)
|
||||
if(worldObj.provider.getDimensionId() != homeLocation.dimensionId)
|
||||
{
|
||||
travelToDimension(homeLocation.dimensionId);
|
||||
}
|
||||
@@ -404,7 +411,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
ItemRobit item = (ItemRobit)entityItem.getEntityItem().getItem();
|
||||
item.setEnergy(entityItem.getEntityItem(), getEnergy());
|
||||
item.setInventory(getInventory(), entityItem.getEntityItem());
|
||||
item.setName(entityItem.getEntityItem(), getCommandSenderName());
|
||||
item.setName(entityItem.getEntityItem(), getName());
|
||||
|
||||
float k = 0.05F;
|
||||
entityItem.motionX = 0;
|
||||
@@ -723,7 +730,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCommandSenderName()
|
||||
public String getName()
|
||||
{
|
||||
return getName().isEmpty() ? "Robit" : getName();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user