mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
Update MCP mappings to snapshot_nodoc_20161220 (#3551)
This commit is contained in:
1 parent
1f4007e5d8
commit
5165dc52bf
88 files changed
+445
-436
No files matched your search
@@ -177,7 +177,7 @@ public final class ModelFluid implements IModelCustomData
|
||||
if(flow == null) flow = -1000f;
|
||||
}
|
||||
int flowRound = (int)Math.round(Math.toDegrees(flow));
|
||||
flowRound = MathHelper.clamp_int(flowRound, -1000, 1000);
|
||||
flowRound = MathHelper.clamp(flowRound, -1000, 1000);
|
||||
return flowRound;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -73,11 +73,11 @@ public final class AnimationItemOverrideList extends ItemOverrideList
|
||||
IAnimationStateMachine asm = stack.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null);
|
||||
if(world == null && entity != null)
|
||||
{
|
||||
world = entity.worldObj;
|
||||
world = entity.world;
|
||||
}
|
||||
if(world == null)
|
||||
{
|
||||
world = Minecraft.getMinecraft().theWorld;
|
||||
world = Minecraft.getMinecraft().world;
|
||||
}
|
||||
IModelState state = asm.apply(Animation.getWorldTime(world, Animation.getPartialTickTime())).getLeft();
|
||||
return model.bake(new ModelStateComposition(state, this.state), format, bakedTextureGetter);
|
||||
|
||||
@@ -88,7 +88,7 @@ public class AnimationModelBase<T extends Entity> extends ModelBase implements I
|
||||
VertexBuffer.setTranslation(-0.5, -1.5, -0.5);
|
||||
|
||||
lighter.setParent(new VertexBufferConsumer(VertexBuffer));
|
||||
lighter.setWorld(entity.worldObj);
|
||||
lighter.setWorld(entity.world);
|
||||
lighter.setState(Blocks.AIR.getDefaultState());
|
||||
lighter.setBlockPos(pos);
|
||||
boolean empty = true;
|
||||
|
||||
@@ -54,7 +54,7 @@ public class AnimationTESR<T extends TileEntity> extends FastTESR<T> implements
|
||||
BlockPos pos = te.getPos();
|
||||
IBlockAccess world = MinecraftForgeClient.getRegionRenderCache(te.getWorld(), pos);
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
if(state.getPropertyNames().contains(Properties.StaticProperty))
|
||||
if(state.getPropertyKeys().contains(Properties.StaticProperty))
|
||||
{
|
||||
state = state.withProperty(Properties.StaticProperty, false);
|
||||
}
|
||||
|
||||
@@ -330,7 +330,7 @@ public class ModelBlockAnimation
|
||||
{
|
||||
int length = loop ? var.samples.length : (var.samples.length - 1);
|
||||
float timeScaled = time * length;
|
||||
int s1 = MathHelper.clamp_int((int)Math.round(Math.floor(timeScaled)), 0, length - 1);
|
||||
int s1 = MathHelper.clamp((int)Math.round(Math.floor(timeScaled)), 0, length - 1);
|
||||
float progress = timeScaled - s1;
|
||||
int s2 = s1 + 1;
|
||||
if(s2 == length && loop) s2 = 0;
|
||||
|
||||
@@ -190,7 +190,7 @@ public enum B3DLoader implements ICustomModelLoader
|
||||
this.animation = animation;
|
||||
this.frame = frame;
|
||||
this.nextFrame = nextFrame;
|
||||
this.progress = MathHelper.clamp_float(progress, 0, 1);
|
||||
this.progress = MathHelper.clamp(progress, 0, 1);
|
||||
this.parent = getParent(parent);
|
||||
}
|
||||
|
||||
|
||||
@@ -175,7 +175,7 @@ public class VertexLighterSmoothAo extends VertexLighterFlat
|
||||
a += ao[sx - 0][sy - 0][sz - 1] * (0 + x) * (0 + y) * (1 - z);
|
||||
a += ao[sx - 0][sy - 0][sz - 0] * (0 + x) * (0 + y) * (0 + z);
|
||||
|
||||
a = MathHelper.clamp_float(a, 0, 1);
|
||||
a = MathHelper.clamp(a, 0, 1);
|
||||
return a;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user