mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 11:05:40 +00:00
Update mcp mappings to 20170611
This commit is contained in:
1 parent
864b05074e
commit
3d322ef925
48 files changed
+213
-211
No files matched your search
@@ -50,7 +50,7 @@ public class LootTablesDebug
|
||||
{
|
||||
// if the player shoots something with a projectile, use looting 3
|
||||
DamageSource damageSource = event.getDamageSource();
|
||||
if (damageSource.isProjectile() && damageSource.getEntity() instanceof EntityPlayer && damageSource.getSourceOfDamage() instanceof EntityArrow)
|
||||
if (damageSource.isProjectile() && damageSource.getTrueSource() instanceof EntityPlayer && damageSource.getImmediateSource() instanceof EntityArrow)
|
||||
{
|
||||
event.setLootingLevel(3);
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@ public class ModelBakeEventDebug
|
||||
{
|
||||
value = 0;
|
||||
}
|
||||
value ^= (1 << (cubeSize * ((int) (vec.xCoord * (cubeSize - .0001))) + ((int) (vec.zCoord * (cubeSize - .0001)))));
|
||||
value ^= (1 << (cubeSize * ((int) (vec.x * (cubeSize - .0001))) + ((int) (vec.z * (cubeSize - .0001)))));
|
||||
cte.setState(cte.getState().withProperty(property, value));
|
||||
world.markBlockRangeForRenderUpdate(pos, pos);
|
||||
}
|
||||
@@ -270,10 +270,10 @@ public class ModelBakeEventDebug
|
||||
Vec3d v3 = rotate(new Vec3d(x2 - .5, y - .5, z2 - .5), side).addVector(.5, .5, .5);
|
||||
Vec3d v4 = rotate(new Vec3d(x2 - .5, y - .5, z1 - .5), side).addVector(.5, .5, .5);
|
||||
return new BakedQuad(Ints.concat(
|
||||
vertexToInts((float) v1.xCoord, (float) v1.yCoord, (float) v1.zCoord, -1, texture, 0, 0),
|
||||
vertexToInts((float) v2.xCoord, (float) v2.yCoord, (float) v2.zCoord, -1, texture, 0, 16),
|
||||
vertexToInts((float) v3.xCoord, (float) v3.yCoord, (float) v3.zCoord, -1, texture, 16, 16),
|
||||
vertexToInts((float) v4.xCoord, (float) v4.yCoord, (float) v4.zCoord, -1, texture, 16, 0)
|
||||
vertexToInts((float) v1.x, (float) v1.y, (float) v1.z, -1, texture, 0, 0),
|
||||
vertexToInts((float) v2.x, (float) v2.y, (float) v2.z, -1, texture, 0, 16),
|
||||
vertexToInts((float) v3.x, (float) v3.y, (float) v3.z, -1, texture, 16, 16),
|
||||
vertexToInts((float) v4.x, (float) v4.y, (float) v4.z, -1, texture, 16, 0)
|
||||
), -1, side, texture, true, DefaultVertexFormats.BLOCK);
|
||||
}
|
||||
|
||||
@@ -345,42 +345,44 @@ public class ModelBakeEventDebug
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("SuspiciousNameCombination")
|
||||
private static Vec3d rotate(Vec3d vec, EnumFacing side)
|
||||
{
|
||||
switch (side)
|
||||
{
|
||||
case DOWN:
|
||||
return new Vec3d(vec.xCoord, -vec.yCoord, -vec.zCoord);
|
||||
return new Vec3d(vec.x, -vec.y, -vec.z);
|
||||
case UP:
|
||||
return new Vec3d(vec.xCoord, vec.yCoord, vec.zCoord);
|
||||
return new Vec3d(vec.x, vec.y, vec.z);
|
||||
case NORTH:
|
||||
return new Vec3d(vec.xCoord, vec.zCoord, -vec.yCoord);
|
||||
return new Vec3d(vec.x, vec.z, -vec.y);
|
||||
case SOUTH:
|
||||
return new Vec3d(vec.xCoord, -vec.zCoord, vec.yCoord);
|
||||
return new Vec3d(vec.x, -vec.z, vec.y);
|
||||
case WEST:
|
||||
return new Vec3d(-vec.yCoord, vec.xCoord, vec.zCoord);
|
||||
return new Vec3d(-vec.y, vec.x, vec.z);
|
||||
case EAST:
|
||||
return new Vec3d(vec.yCoord, -vec.xCoord, vec.zCoord);
|
||||
return new Vec3d(vec.y, -vec.x, vec.z);
|
||||
}
|
||||
throw new IllegalArgumentException("Unknown Side " + side);
|
||||
}
|
||||
|
||||
@SuppressWarnings("SuspiciousNameCombination")
|
||||
private static Vec3d revRotate(Vec3d vec, EnumFacing side)
|
||||
{
|
||||
switch (side)
|
||||
{
|
||||
case DOWN:
|
||||
return new Vec3d(vec.xCoord, -vec.yCoord, -vec.zCoord);
|
||||
return new Vec3d(vec.x, -vec.y, -vec.z);
|
||||
case UP:
|
||||
return new Vec3d(vec.xCoord, vec.yCoord, vec.zCoord);
|
||||
return new Vec3d(vec.x, vec.y, vec.z);
|
||||
case NORTH:
|
||||
return new Vec3d(vec.xCoord, -vec.zCoord, vec.yCoord);
|
||||
return new Vec3d(vec.x, -vec.z, vec.y);
|
||||
case SOUTH:
|
||||
return new Vec3d(vec.xCoord, vec.zCoord, -vec.yCoord);
|
||||
return new Vec3d(vec.x, vec.z, -vec.y);
|
||||
case WEST:
|
||||
return new Vec3d(vec.yCoord, -vec.xCoord, vec.zCoord);
|
||||
return new Vec3d(vec.y, -vec.x, vec.z);
|
||||
case EAST:
|
||||
return new Vec3d(-vec.yCoord, vec.xCoord, vec.zCoord);
|
||||
return new Vec3d(-vec.y, vec.x, vec.z);
|
||||
}
|
||||
throw new IllegalArgumentException("Unknown Side " + side);
|
||||
}
|
||||
|
||||
@@ -195,7 +195,7 @@ public class PlayerInteractEventTest
|
||||
|
||||
if (!evt.getWorld().isRemote
|
||||
&& evt.getTarget() instanceof EntitySkeleton
|
||||
&& evt.getLocalPos().yCoord > evt.getTarget().height / 2.0)
|
||||
&& evt.getLocalPos().y > evt.getTarget().height / 2.0)
|
||||
{
|
||||
// If we right click the upper half of a skeleton it dies.
|
||||
evt.getTarget().setDead();
|
||||
|
||||
@@ -240,7 +240,7 @@ public class TestCapabilityMod
|
||||
{
|
||||
List<EntityPlayer> players = event.world.playerEntities;
|
||||
int i = 0;
|
||||
for (Village village : event.world.villageCollectionObj.getVillageList())
|
||||
for (Village village : event.world.villageCollection.getVillageList())
|
||||
{
|
||||
if (village.hasCapability(TEST_CAP, null))
|
||||
{
|
||||
|
||||
@@ -44,7 +44,7 @@ public class WorldCapabilityRainTimerTest
|
||||
@SubscribeEvent
|
||||
public void attatchTimer(AttachCapabilitiesEvent<World> event)
|
||||
{
|
||||
if (!event.getObject().isRemote && !event.getObject().provider.hasNoSky())
|
||||
if (!event.getObject().isRemote && !event.getObject().provider.isNether())
|
||||
{
|
||||
event.addCapability(new ResourceLocation(MODID, "rainTimer"), new RainTimerProvider());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user