Commit 6b0d6467 authored by Bailey's avatar Bailey 🚟

mappings update

parent 031c5ad6
......@@ -19,7 +19,7 @@ archivesBaseName = 'rediscovered-1.15.1'
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
minecraft {
mappings channel: 'snapshot', version: '20200122-1.15.1'
mappings channel: 'snapshot', version: '20200123-1.15.1'
runs {
client {
workingDirectory project.file('run')
......
......@@ -67,9 +67,9 @@ public class BlackSteveRenderer extends EntityRenderer<BlackSteveEntity>
matrix.push();
float f5 = entity.prevRenderYawOffset + (entity.renderYawOffset - entity.prevRenderYawOffset) * ticks;
matrix.translate(f1, f2, yaw);
RenderType.entityCutout(RediscoveredMod.locate("textures/entity/black_steve.png"));
matrix.rotate(Vector3f.field_229181_d_.func_229187_a_(-f5 + 180F));
matrix.rotate(Vector3f.field_229179_b_.func_229187_a_(-90.0F));
RenderType.entityCutout(RediscoveredMod.locate("textures/entity/steve.png"));
matrix.rotate(Vector3f.YP.rotationDegrees(-f5 + 180F));
matrix.rotate(Vector3f.YP.rotationDegrees(-90.0F));
matrix.scale(0.02F, -0.02F, 0.02F);
float rotation = entity.ticksExisted + ticks * getSpeedMultiplier(entity);
......
......@@ -20,9 +20,9 @@ public class FishRenderer extends MobRenderer<FishEntity, FishModel<FishEntity>>
{
private static final ResourceLocation FISH_LOCATION = RediscoveredMod.locate("textures/entity/fish.png");
public FishRenderer(EntityRendererManager p_i48864_1_)
public FishRenderer(EntityRendererManager manager)
{
super(p_i48864_1_, new FishModel<>(), 0.3F);
super(manager, new FishModel<>(), 0.3F);
}
@Nullable
......@@ -31,19 +31,16 @@ public class FishRenderer extends MobRenderer<FishEntity, FishModel<FishEntity>>
return FISH_LOCATION;
}
// applyRotations
@Override
protected void func_225621_a_(FishEntity entity, MatrixStack matrix, float p_225621_3_, float p_225621_4_, float p_225621_5_)
protected void applyRotations(FishEntity entityLiving, MatrixStack matrixStackIn, float ageInTicks, float rotationYaw, float partialTicks)
{
super.func_225621_a_(entity, matrix, p_225621_3_, p_225621_4_, p_225621_5_);
float f = 4.3F * MathHelper.sin(0.6F * p_225621_3_);
matrix.rotate(Vector3f.field_229181_d_.func_229187_a_(f));
if (!entity.isInWater())
super.applyRotations(entityLiving, matrixStackIn, ageInTicks, rotationYaw, partialTicks);
float f = 4.3F * MathHelper.sin(0.6F * ageInTicks);
matrixStackIn.rotate(Vector3f.YP.rotationDegrees(f));
if (!entityLiving.isInWater())
{
matrix.translate((double) 0.1F, (double) 0.1F, (double) -0.1F);
matrix.rotate(Vector3f.field_229183_f_.func_229187_a_(90.0F));
matrixStackIn.translate((double) 0.1F, (double) 0.1F, (double) -0.1F);
matrixStackIn.rotate(Vector3f.ZP.rotationDegrees(90.0F));
}
}
}
\ No newline at end of file
......@@ -66,9 +66,9 @@ public class RanaRenderer extends EntityRenderer<RanaEntity>
matrix.push();
float f5 = entity.prevRenderYawOffset + (entity.renderYawOffset - entity.prevRenderYawOffset) * ticks;
matrix.translate(f1, f2, yaw);
RenderType.entityCutout(RediscoveredMod.locate("textures/entity/rana.png"));
matrix.rotate(Vector3f.field_229181_d_.func_229187_a_(-f5 + 180F));
matrix.rotate(Vector3f.field_229179_b_.func_229187_a_(-90.0F));
RenderType.entityCutout(RediscoveredMod.locate("textures/entity/steve.png"));
matrix.rotate(Vector3f.YP.rotationDegrees(-f5 + 180F));
matrix.rotate(Vector3f.YP.rotationDegrees(-90.0F));
matrix.scale(0.02F, -0.02F, 0.02F);
float rotation = entity.ticksExisted + ticks * getSpeedMultiplier(entity);
......
......@@ -24,9 +24,8 @@ public class RangedPigmanRenderer<T extends RangedPigmanEntity, M extends BipedM
this.addLayer(new BipedArmorLayer<>(this, new BipedModel<>(0.5F), new BipedModel<>(1.0F)));
}
// preRenderCallback
@Override
protected void func_225620_a_(RangedPigmanEntity entity, MatrixStack stack, float partialTickTime)
protected void preRenderCallback(RangedPigmanEntity entity, MatrixStack stack, float partialTickTime)
{
if (entity.isAggressive() && entity.getHeldItemMainhand().getItem() instanceof BowItem)
{
......
package com.legacy.rediscovered.client.render.entity;
import javax.annotation.Nullable;
import com.legacy.rediscovered.RediscoveredMod;
import com.legacy.rediscovered.client.render.model.ScarecrowModel;
import com.legacy.rediscovered.entity.ScarecrowEntity;
......@@ -29,27 +31,25 @@ public class ScarecrowRenderer extends LivingRenderer<ScarecrowEntity, Scarecrow
return TEXTURE;
}
// applyRotations
@Override
protected void func_225621_a_(ScarecrowEntity p_225621_1_, MatrixStack p_225621_2_, float p_225621_3_, float p_225621_4_, float p_225621_5_)
protected void applyRotations(ScarecrowEntity entityLiving, MatrixStack matrixStackIn, float ageInTicks, float rotationYaw, float partialTicks)
{
p_225621_2_.rotate(Vector3f.field_229181_d_.func_229187_a_(180.0F - p_225621_4_));
float f = (float) (p_225621_1_.world.getGameTime() - p_225621_1_.punchCooldown) + p_225621_5_;
matrixStackIn.rotate(Vector3f.YP.rotationDegrees(180.0F - rotationYaw));
float f = (float) (entityLiving.world.getGameTime() - entityLiving.punchCooldown) + partialTicks;
if (f < 5.0F)
{
p_225621_2_.rotate(Vector3f.field_229181_d_.func_229187_a_(MathHelper.sin(f / 1.5F * (float) Math.PI) * 3.0F));
matrixStackIn.rotate(Vector3f.YP.rotationDegrees(MathHelper.sin(f / 1.5F * (float) Math.PI) * 3.0F));
}
}
@Override
protected boolean canRenderName(ScarecrowEntity entity)
{
double d0 = this.renderManager.func_229099_b_(entity);
double d0 = this.renderManager.squareDistanceTo(entity);
float f = entity.isCrouching() ? 32.0F : 64.0F;
return d0 >= (double) (f * f) ? false : entity.isCustomNameVisible();
}
@Nullable
@Override
protected RenderType func_230042_a_(ScarecrowEntity p_230042_1_, boolean p_230042_2_, boolean p_230042_3_)
{
......
......@@ -62,8 +62,8 @@ public class SteveRenderer extends EntityRenderer<SteveEntity>
float f5 = entity.prevRenderYawOffset + (entity.renderYawOffset - entity.prevRenderYawOffset) * ticks;
matrix.translate(f1, f2, yaw);
RenderType.entityCutout(RediscoveredMod.locate("textures/entity/steve.png"));
matrix.rotate(Vector3f.field_229181_d_.func_229187_a_(-f5 + 180F));
matrix.rotate(Vector3f.field_229179_b_.func_229187_a_(-90.0F));
matrix.rotate(Vector3f.YP.rotationDegrees(-f5 + 180F));
matrix.rotate(Vector3f.YP.rotationDegrees(-90.0F));
matrix.scale(0.02F, -0.02F, 0.02F);
float rotation = entity.ticksExisted + ticks * getSpeedMultiplier(entity);
......
......@@ -39,7 +39,7 @@ public class FishModel<T extends LivingEntity> extends SegmentedModel<T>
}
@Override
public Iterable<ModelRenderer> func_225601_a_()
public Iterable<ModelRenderer> getParts()
{
return ImmutableList.of(this.body, this.upper_fin, this.back_fin, this.right_fin, this.left_fin);
}
......
......@@ -46,7 +46,7 @@ public class ScarecrowModel<T extends Entity> extends SegmentedModel<T>
}
@Override
public Iterable<ModelRenderer> func_225601_a_()
public Iterable<ModelRenderer> getParts()
{
return ImmutableList.of(this.Body, this.Head, this.Arms, this.Leg);
......
......@@ -366,7 +366,7 @@ public class RediscoveredEvents
float f = horse.getBrightness();
BlockPos blockpos = horse.getRidingEntity() instanceof BoatEntity ? (new BlockPos(horse.getPosition().getX(), (double) Math.round(horse.getPosition().getY()), horse.getPosition().getZ())).up() : new BlockPos(horse.getPosition().getX(), (double) Math.round(horse.getPosition().getY()), horse.getPosition().getZ());
if (f > 0.5F && horse.world.rand.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && horse.world.func_226660_f_(blockpos))
if (f > 0.5F && horse.world.rand.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && horse.world.canSeeSky(blockpos))
{
horse.setFire(8);
}
......
......@@ -61,7 +61,7 @@ public final class SkylandsBiome extends Biome
@OnlyIn(Dist.CLIENT)
@Override
public int func_225529_c_() // getSkyColorByTemp
public int getSkyColor()
{
return 0xbec4ee;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment