Skip to content

Commit

Permalink
Updated Ocean Shield model and texture
Browse files Browse the repository at this point in the history
  • Loading branch information
@Majrusz
Majrusz committed Jun 15, 2021
1 parent 7ee676b commit fb97316
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 47 deletions.
101 changes: 55 additions & 46 deletions src/main/java/com/majruszs_difficulty/models/OceanShieldModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,64 +13,73 @@
public class OceanShieldModel extends Model {
public ModelRenderer plate;
public ModelRenderer handle;
public ModelRenderer spike1;
public ModelRenderer spike2;
public ModelRenderer spike3;
public ModelRenderer spike4;
public ModelRenderer spike5;
public ModelRenderer spike1, spike2, spike3, spike4, spike5, spike6, spike7, spike8;

public OceanShieldModel() {
super( RenderType::getEntitySolid );

this.textureWidth = 64;
this.textureHeight = 64;

this.plate = new ModelRenderer( this, 0, 0 );
this.plate.setRotationPoint( 0.0F, 0.0F, 0.0F );
this.plate.addBox( -7.0F, -11.0F, -2.0F, 14.0F, 12.0F, 1.0F, 0.0F, 0.0F, 0.0F );
this.plate.setTextureOffset( 0, 13 )
.addBox( -6.0F, 1.0F, -2.0F, 12.0F, 3.0F, 1.0F, 0.0F, 0.0F, 0.0F );
this.plate.setTextureOffset( 0, 17 )
.addBox( -5.0F, 4.0F, -2.0F, 10.0F, 3.0F, 1.0F, 0.0F, 0.0F, 0.0F );
this.plate.setTextureOffset( 0, 21 )
.addBox( -4.0F, 7.0F, -2.0F, 8.0F, 2.0F, 1.0F, 0.0F, 0.0F, 0.0F );
this.plate.setTextureOffset( 0, 24 )
.addBox( -3.0F, 9.0F, -2.0F, 6.0F, 1.0F, 1.0F, 0.0F, 0.0F, 0.0F );

this.handle = new ModelRenderer( this, 0, 0 );
this.handle.setRotationPoint( 0.0F, 0.0F, 0.0F );
this.handle.setTextureOffset( 30, 0 )
.addBox( -1.0F, -3.0F, -1.0F, 2.0F, 6.0F, 6.0F, 0.0F, 0.0F, 0.0F );

this.spike1 = new ModelRenderer( this, 0, 0 );
this.spike1.setRotationPoint( 0.0F, 0.0F, 0.0F );
this.spike1.setTextureOffset( 46, 0 )
.addBox( -4.0F, -8.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F );

this.spike2 = new ModelRenderer( this, 0, 0 );
this.spike2.setRotationPoint( 0.0F, 0.0F, 0.0F );
this.spike2.setTextureOffset( 46, 0 )
.addBox( 3.0F, -8.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F );

this.spike3 = new ModelRenderer( this, 0, 0 );
this.spike3.setRotationPoint( 0.0F, 0.0F, 0.0F );
this.spike3.setTextureOffset( 46, 0 )
.addBox( 2.0F, -1.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F );

this.spike4 = new ModelRenderer( this, 0, 0 );
this.spike4.setRotationPoint( 0.0F, 0.0F, 0.0F );
this.spike4.setTextureOffset( 46, 0 )
.addBox( -3.0F, -1.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F );

this.spike5 = new ModelRenderer( this, 0, 0 );
this.spike5.setRotationPoint( 0.0F, 0.0F, 0.0F );
this.spike5.setTextureOffset( 46, 0 )
.addBox( -0.5F, 6.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F );
this.handle = new ModelRenderer(this, 0, 0);
this.handle.setRotationPoint(0.0F, 0.0F, 0.0F);
this.handle.setTextureOffset(30, 0).addBox(-1.0F, -3.0F, -1.0F, 2.0F, 6.0F, 6.0F, 0.0F, 0.0F, 0.0F);

this.plate = new ModelRenderer(this, 0, 0);
this.plate.setRotationPoint(0.0F, 0.0F, 0.0F);
this.plate.addBox(-7.0F, -11.0F, -2.0F, 14.0F, 12.0F, 1.0F, 0.0F, 0.0F, 0.0F);
this.plate.setTextureOffset(0, 13).addBox(-6.0F, 1.0F, -2.0F, 12.0F, 3.0F, 1.0F, 0.0F, 0.0F, 0.0F);
this.plate.setTextureOffset(0, 17).addBox(-5.0F, 4.0F, -2.0F, 10.0F, 3.0F, 1.0F, 0.0F, 0.0F, 0.0F);
this.plate.setTextureOffset(0, 21).addBox(-4.0F, 7.0F, -2.0F, 8.0F, 2.0F, 1.0F, 0.0F, 0.0F, 0.0F);
this.plate.setTextureOffset(0, 24).addBox(-3.0F, 9.0F, -2.0F, 6.0F, 1.0F, 1.0F, 0.0F, 0.0F, 0.0F);

this.spike1 = new ModelRenderer(this, 0, 0);
this.spike1.setRotationPoint(0.0F, 0.0F, 0.0F);
this.spike1.setTextureOffset(46, 0).addBox(-4.0F, -8.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F);
this.setRotateAngle(spike1, 0.0F, 0.17453292519943295F, 0.0F);

this.spike2 = new ModelRenderer(this, 0, 0);
this.spike2.setRotationPoint(0.0F, 0.0F, 0.0F);
this.spike2.setTextureOffset(46, 0).addBox(3.0F, -8.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F);
this.setRotateAngle(spike2, 0.0F, -0.17453292519943295F, 0.0F);

this.spike3 = new ModelRenderer(this, 0, 0);
this.spike3.setRotationPoint(0.0F, 0.0F, 0.0F);
this.spike3.setTextureOffset(46, 0).addBox(2.0F, -1.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F);
this.setRotateAngle(spike3, 0.0F, -0.17453292519943295F, 0.0F);

this.spike4 = new ModelRenderer(this, 0, 0);
this.spike4.setRotationPoint(0.0F, 0.0F, 0.0F);
this.spike4.setTextureOffset(46, 0).addBox(-3.0F, -1.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F);
this.setRotateAngle(spike4, 0.0F, 0.17453292519943295F, 0.0F);

this.spike5 = new ModelRenderer(this, 0, 0);
this.spike5.setRotationPoint(0.0F, 0.0F, 0.0F);
this.spike5.setTextureOffset(46, 0).addBox(-0.5F, 5.0F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, 0.0F, 0.0F);
this.setRotateAngle(spike5, 0.12217304763960307F, 0.0F, 0.0F);

this.spike6 = new ModelRenderer(this, 0, 0);
this.spike6.setRotationPoint(0.0F, 0.0F, 0.0F);
this.spike6.setTextureOffset(47, 1).addBox(-2.5F, -4.5F, -3.0F, 1.0F, 1.0F, 1.0F, 0.0F, 0.0F, 0.0F);

this.spike7 = new ModelRenderer(this, 0, 0);
this.spike7.setRotationPoint(0.0F, 0.0F, 0.0F);
this.spike7.setTextureOffset(47, 1).addBox(1.5F, -4.5F, -3.0F, 1.0F, 1.0F, 1.0F, 0.0F, 0.0F, 0.0F);

this.spike8 = new ModelRenderer(this, 0, 0);
this.spike8.setRotationPoint(0.0F, 0.0F, 0.0F);
this.spike8.setTextureOffset(47, 1).addBox(-0.5F, 2.0F, -3.0F, 1.0F, 1.0F, 1.0F, 0.0F, 0.0F, 0.0F);
}

@Override
public void render( MatrixStack matrix, IVertexBuilder buffer, int packedLight, int overlay, float red, float green, float blue, float alpha ) {
ImmutableList.of( this.plate, this.handle, this.spike1, this.spike2, this.spike3, this.spike4, this.spike5 )
.forEach( ( modelRenderer )->modelRenderer.render( matrix, buffer, packedLight, overlay, red, green, blue, alpha ) );
}

public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/majruszs_difficulty/renderers/OceanShieldRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void func_239207_a_( ItemStack stack, ItemCameraTransforms.TransformType
this.oceanShield.handle.render( matrixStack, ivertexbuilder, combinedLight, combinedOverlay, 1.0F, 1.0F, 1.0F, 1.0F );
if( !flag ) {
ImmutableList.of( this.oceanShield.plate, this.oceanShield.spike1, this.oceanShield.spike2, this.oceanShield.spike3,
this.oceanShield.spike4, this.oceanShield.spike5
this.oceanShield.spike4, this.oceanShield.spike5, this.oceanShield.spike6, this.oceanShield.spike7, this.oceanShield.spike8
)
.forEach( ( part )->part.render( matrixStack, ivertexbuilder, combinedLight, combinedOverlay, 1.0F, 1.0F, 1.0F, 1.0F ) );
}
Expand Down
Binary file modified src/main/resources/assets/majruszs_difficulty/textures/entity/ocean_shield.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit fb97316

Please sign in to comment.