Update mappings to 09/21 snapshots.

Conflict with getMatrix in ITransformation, so renamed to getMatrixVec.
This commit is contained in:
LexManos committed 2018-09-22 03:40:22 -07:00
1 parent 5ed03945a0
commit 94e1a8e0a4
210 files changed
+1052 -978

No files matched your search

@@ -63,7 +63,7 @@ public class BlockSnapshot
public BlockSnapshot(World world, BlockPos pos, IBlockState state, @Nullable NBTTagCompound nbt)
{
this.setWorld(world);
this.dimId = world.provider.getId();
this.dimId = world.dimension.getId();
this.pos = pos.toImmutable();
this.setReplacedBlock(state);
this.registryName = state.getBlock().getRegistryName();
@@ -113,12 +113,12 @@ public class BlockSnapshot
public static BlockSnapshot readFromNBT(NBTTagCompound tag)
{
return new BlockSnapshot(
tag.getInteger("dimension"),
new BlockPos(tag.getInteger("posX"), tag.getInteger("posY"), tag.getInteger("posZ")),
tag.getInt("dimension"),
new BlockPos(tag.getInt("posX"), tag.getInt("posY"), tag.getInt("posZ")),
new ResourceLocation(tag.getString("blockMod"), tag.getString("blockName")),
tag.getInteger("metadata"),
tag.getInteger("flag"),
tag.getBoolean("hasTE") ? tag.getCompoundTag("tileEntity") : null);
tag.getInt("metadata"),
tag.getInt("flag"),
tag.getBoolean("hasTE") ? tag.getCompound("tileEntity") : null);
}
@Nullable
@@ -126,7 +126,7 @@ public class BlockSnapshot
{
if (te == null) return null;
NBTTagCompound nbt = new NBTTagCompound();
te.writeToNBT(nbt);
te.write(nbt);
return nbt;
}
@@ -150,7 +150,7 @@ public class BlockSnapshot
{
if (this.replacedBlock == null)
{
this.replacedBlock = ForgeRegistries.BLOCKS.getValue(getRegistryName()).func_196257_b(getMeta());
this.replacedBlock = ForgeRegistries.BLOCKS.getValue(getRegistryName()).getStateById(getMeta());
}
return this.replacedBlock;
}
@@ -158,7 +158,7 @@ public class BlockSnapshot
@Nullable
public TileEntity getTileEntity()
{
return getNbt() != null ? TileEntity.func_203403_c(getNbt()) : null;
return getNbt() != null ? TileEntity.create(getNbt()) : null;
}
public boolean restore()
@@ -202,7 +202,7 @@ public class BlockSnapshot
te = world.getTileEntity(pos);
if (te != null)
{
te.readFromNBT(getNbt());
te.read(getNbt());
te.markDirty();
}
}
@@ -218,12 +218,12 @@ public class BlockSnapshot
{
compound.setString("blockMod", getRegistryName().getNamespace());
compound.setString("blockName", getRegistryName().getPath());
compound.setInteger("posX", getPos().getX());
compound.setInteger("posY", getPos().getY());
compound.setInteger("posZ", getPos().getZ());
compound.setInteger("flag", getFlag());
compound.setInteger("dimension", getDimId());
compound.setInteger("metadata", getMeta());
compound.setInt("posX", getPos().getX());
compound.setInt("posY", getPos().getY());
compound.setInt("posZ", getPos().getZ());
compound.setInt("flag", getFlag());
compound.setInt("dimension", getDimId());
compound.setInt("metadata", getMeta());
compound.setBoolean("hasTE", getNbt() != null);
@@ -77,4 +77,4 @@ public class ChunkCoordComparator implements java.util.Comparator<ChunkPos>
}
}
}
}
}
@@ -29,7 +29,7 @@ public class Constants
* NBT Tag type IDS, used when storing the nbt to disc, Should align with NBTBase.getId,
* table used in NBTBase.func_150283_g
*
* Main use is checking tag type in NBTTagCompound.func_150297_b(String, int)
* Main use is checking tag type in NBTTagCompound.contains(String, int)
*
*/
public static class NBT
@@ -38,7 +38,7 @@ public class FakePlayer extends EntityPlayerMP
{
public FakePlayer(WorldServer world, GameProfile name)
{
super(world.getMinecraftServer(), world, name, new PlayerInteractionManager(world));
super(world.getServer(), world, name, new PlayerInteractionManager(world));
}
@Override public Vec3d getPositionVector(){ return new Vec3d(0, 0, 0); }
@@ -46,10 +46,10 @@ public class FakePlayer extends EntityPlayerMP
@Override public void sendMessage(ITextComponent component) {}
@Override public void addStat(StatBase par1StatBase, int par2){}
//@Override public void openGui(Object mod, int modGuiId, World world, int x, int y, int z){}
@Override public boolean isEntityInvulnerable(DamageSource source){ return true; }
@Override public boolean isInvulnerableTo(DamageSource source){ return true; }
@Override public boolean canAttackPlayer(EntityPlayer player){ return false; }
@Override public void onDeath(DamageSource source){ return; }
@Override public void onUpdate(){ return; }
@Override public void tick(){ return; }
@Override public Entity changeDimension(int dim, ITeleporter teleporter){ return this; }
@Override public void handleClientSettings(CPacketClientSettings pkt){ return; }
}
@@ -49,7 +49,7 @@ public class PacketUtil
if (stack.getItem().isDamageable() || stack.getItem().getShareTag())
{
nbttagcompound = stack.getTagCompound();
nbttagcompound = stack.getTag();
}
buffer.writeCompoundTag(nbttagcompound);
@@ -44,7 +44,7 @@ public class WorldCapabilityData extends WorldSavedData
}
@Override
public void readFromNBT(NBTTagCompound nbt)
public void read(NBTTagCompound nbt)
{
this.capNBT = nbt;
if (serializable != null)
@@ -55,7 +55,7 @@ public class WorldCapabilityData extends WorldSavedData
}
@Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt)
public NBTTagCompound write(NBTTagCompound nbt)
{
if (serializable != null)
nbt = serializable.serializeNBT();