Skip to content

Commit

Permalink
Merge pull request #679 from Paul19988/1.7-Community-4.3
Browse files Browse the repository at this point in the history 
general code cleanup
  • Loading branch information
@EternalBlueFlame
EternalBlueFlame authored Nov 23, 2023
2 parents 2e24413 + 8dbc350 commit db95dcb
Show file tree
Hide file tree
Showing 47 changed files with 12,340 additions and 12,427 deletions.
73 changes: 43 additions & 30 deletions src/main/java/train/client/TechneModelRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,43 @@
* A middleman class to convert Techne models to something tmt can actually render properly.
*/
public class TechneModelRenderer extends ModelRendererTurbo {
private static final int staticTextureSize =512;
/**define the part with no texture offset, but using a static texture size of 512x512 and a defined name.*/
private static final int staticTextureSize = 512;

/**
* Define the part with no texture offset, but using a static texture size of 512x512 and a defined name.
*/
public TechneModelRenderer(ModelBase modelBase, String name) {
super(modelBase, name);
this.setTextureOffset(staticTextureSize,staticTextureSize);
this.setTextureOffset(staticTextureSize, staticTextureSize);
}
/**define the part with a texture offset, but using a static name and texture size of 512x512*/

/**
* Define the part with a texture offset, but using a static name and texture size of 512x512.
*/
public TechneModelRenderer(ModelBase modelBase, int textureOffsetX, int textureOffsetY) {
this(modelBase, "void");
this.setTextureOffset(textureOffsetX,textureOffsetY);
this.setTextureOffset(textureOffsetX, textureOffsetY);
}
/**define the part with all data.*/

/**
* Define the part with all data.
*/
public TechneModelRenderer(ModelBase modelBase, int textureOffsetX, int textureOffsetY, String name) {
this(modelBase, name);
this.setTextureOffset(textureOffsetX,textureOffsetY);
this.setTextureOffset(textureOffsetX, textureOffsetY);
}
private TexturedPolygon faces[];

@Override
public ModelRendererTurbo addBox(float f, float f1, float f2, int i, int j, int k, float f3) {
faces = new TexturedPolygon[6];
float f4 = f + i +f3;
float f5 = f1 + j +f3;
float f6 = f2 + k +f3;
TexturedPolygon[] faces = new TexturedPolygon[6];
float f4 = f + i + f3;
float f5 = f1 + j + f3;
float f6 = f2 + k + f3;

f -= f3;
f1 -= f3;
f2 -= f3;

TexturedVertex PositionTransformVertex = new TexturedVertex(f, f1, f2, 0.0F, 0.0F);
TexturedVertex PositionTransformVertex1 = new TexturedVertex(f4, f1, f2, 0.0F, 8F);
TexturedVertex PositionTransformVertex2 = new TexturedVertex(f4, f5, f2, 8F, 8F);
Expand All @@ -45,12 +56,13 @@ public ModelRendererTurbo addBox(float f, float f1, float f2, int i, int j, int
TexturedVertex PositionTransformVertex5 = new TexturedVertex(f4, f1, f6, 0.0F, 8F);
TexturedVertex PositionTransformVertex6 = new TexturedVertex(f4, f5, f6, 8F, 8F);
TexturedVertex PositionTransformVertex7 = new TexturedVertex(f, f5, f6, 8F, 0.0F);
faces[0] = generateFaces(new TexturedVertex[] { PositionTransformVertex5, PositionTransformVertex1, PositionTransformVertex2, PositionTransformVertex6 }, textureOffsetX + k + i, textureOffsetY + k, textureOffsetX + k + i + k, textureOffsetY + k + j, textureWidth, textureHeight);
faces[1] = generateFaces(new TexturedVertex[] { PositionTransformVertex, PositionTransformVertex4, PositionTransformVertex7, PositionTransformVertex3 }, textureOffsetX, textureOffsetY + k, textureOffsetX + k, textureOffsetY + k + j, textureWidth, textureHeight);
faces[2] = generateFaces(new TexturedVertex[] { PositionTransformVertex5, PositionTransformVertex4, PositionTransformVertex, PositionTransformVertex1 }, textureOffsetX + k, textureOffsetY, textureOffsetX + k + i, textureOffsetY + k, textureWidth, textureHeight);
faces[3] = generateFaces(new TexturedVertex[] { PositionTransformVertex2, PositionTransformVertex3, PositionTransformVertex7, PositionTransformVertex6 }, textureOffsetX + k + i, textureOffsetY, textureOffsetX + k + i + i, textureOffsetY + k, textureWidth, textureHeight);
faces[4] = generateFaces(new TexturedVertex[] { PositionTransformVertex1, PositionTransformVertex, PositionTransformVertex3, PositionTransformVertex2 }, textureOffsetX + k, textureOffsetY + k, textureOffsetX + k + i, textureOffsetY + k + j, textureWidth, textureHeight);
faces[5] = generateFaces(new TexturedVertex[] { PositionTransformVertex4, PositionTransformVertex5, PositionTransformVertex6, PositionTransformVertex7 }, textureOffsetX + k + i + k, textureOffsetY + k, textureOffsetX + k + i + k + i, textureOffsetY + k + j, textureWidth, textureHeight);

faces[0] = generateFaces(new TexturedVertex[]{PositionTransformVertex5, PositionTransformVertex1, PositionTransformVertex2, PositionTransformVertex6}, textureOffsetX + k + i, textureOffsetY + k, textureOffsetX + k + i + k, textureOffsetY + k + j, textureWidth, textureHeight);
faces[1] = generateFaces(new TexturedVertex[]{PositionTransformVertex, PositionTransformVertex4, PositionTransformVertex7, PositionTransformVertex3}, textureOffsetX, textureOffsetY + k, textureOffsetX + k, textureOffsetY + k + j, textureWidth, textureHeight);
faces[2] = generateFaces(new TexturedVertex[]{PositionTransformVertex5, PositionTransformVertex4, PositionTransformVertex, PositionTransformVertex1}, textureOffsetX + k, textureOffsetY, textureOffsetX + k + i, textureOffsetY + k, textureWidth, textureHeight);
faces[3] = generateFaces(new TexturedVertex[]{PositionTransformVertex2, PositionTransformVertex3, PositionTransformVertex7, PositionTransformVertex6}, textureOffsetX + k + i, textureOffsetY, textureOffsetX + k + i + i, textureOffsetY + k, textureWidth, textureHeight);
faces[4] = generateFaces(new TexturedVertex[]{PositionTransformVertex1, PositionTransformVertex, PositionTransformVertex3, PositionTransformVertex2}, textureOffsetX + k, textureOffsetY + k, textureOffsetX + k + i, textureOffsetY + k + j, textureWidth, textureHeight);
faces[5] = generateFaces(new TexturedVertex[]{PositionTransformVertex4, PositionTransformVertex5, PositionTransformVertex6, PositionTransformVertex7}, textureOffsetX + k + i + k, textureOffsetY + k, textureOffsetX + k + i + k + i, textureOffsetY + k + j, textureWidth, textureHeight);

textureGroup.get("0").poly.clear();
textureGroup.get("0").addPoly(faces[0]);
Expand All @@ -61,26 +73,27 @@ public ModelRendererTurbo addBox(float f, float f1, float f2, int i, int j, int
textureGroup.get("0").addPoly(faces[5]);
return this;
}
private static TexturedPolygon generateFaces(TexturedVertex aPositionTransformVertex[], int i, int j, int k, int l, float textureWidth, float textureHeight) {

private static TexturedPolygon generateFaces(TexturedVertex[] aPositionTransformVertex, int i, int j, int k, int l, float textureWidth, float textureHeight) {
aPositionTransformVertex[0] = new TexturedVertex(aPositionTransformVertex[0].vector3F, (float) k / textureWidth - 0.0015625F, (float) j / textureHeight + 0.003125F);
aPositionTransformVertex[1] = new TexturedVertex(aPositionTransformVertex[1].vector3F,(float) i / textureWidth + 0.0015625F, (float) j / textureHeight + 0.003125F);
aPositionTransformVertex[2] = new TexturedVertex(aPositionTransformVertex[2].vector3F,(float) i / textureWidth + 0.0015625F, (float) l / textureHeight - 0.003125F);
aPositionTransformVertex[3] = new TexturedVertex(aPositionTransformVertex[3].vector3F,(float) k / textureWidth - 0.0015625F, (float) l / textureHeight - 0.003125F);
aPositionTransformVertex[1] = new TexturedVertex(aPositionTransformVertex[1].vector3F, (float) i / textureWidth + 0.0015625F, (float) j / textureHeight + 0.003125F);
aPositionTransformVertex[2] = new TexturedVertex(aPositionTransformVertex[2].vector3F, (float) i / textureWidth + 0.0015625F, (float) l / textureHeight - 0.003125F);
aPositionTransformVertex[3] = new TexturedVertex(aPositionTransformVertex[3].vector3F, (float) k / textureWidth - 0.0015625F, (float) l / textureHeight - 0.003125F);
return new TexturedPolygon(aPositionTransformVertex);
}

/**
* <h2>set Rotation point</h2>
* this set's the rotation point with the offsets defined in
* @see #addBox(float, float, float, float, float, float)
* <h2>Set Rotation point</h2>
* This set's the rotation point with the offsets defined.
*
* @see #addBox(float, float, float, int, int, int, float)
*/
@Override
public ModelRendererTurbo setRotationPoint(float pointX, float pointY, float pointZ) {
this.rotationPointX = pointX;
this.rotationPointY = pointY-15;
this.rotationPointZ = pointZ;
return this;
this.rotationPointX = pointX;
this.rotationPointY = pointY - 15;
this.rotationPointZ = pointZ;
return this;
}

}
25 changes: 12 additions & 13 deletions src/main/java/train/client/core/AlphaExpiredException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,20 @@
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiErrorScreen;

public class AlphaExpiredException extends CustomModLoadingErrorDisplayException {
public class AlphaExpiredException extends CustomModLoadingErrorDisplayException {

private static final long serialVersionUID = 4917296650073454368L;
private static final long serialVersionUID = 4917296650073454368L;

@Override
public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
}
@Override
public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
}

@Override
public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY,
float tickTime) {
errorScreen.drawCenteredString(fontRenderer, "You're trying to use a Traincraft alpha-version past its expiry date.", errorScreen.width/2, 95, 0xEEEEEE);
errorScreen.drawCenteredString(fontRenderer, "Download a release-build at", errorScreen.width/2, 105, 0xEEEEEE);
errorScreen.drawCenteredString(fontRenderer, "https://minecraft.curseforge.com/projects/traincraft.", errorScreen.width/2, 125, 0xEEEEEE);

}
@Override
public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY,
float tickTime) {
errorScreen.drawCenteredString(fontRenderer, "You're trying to use a Traincraft alpha-version past its expiry date.", errorScreen.width / 2, 95, 0xEEEEEE);
errorScreen.drawCenteredString(fontRenderer, "Download a release-build at", errorScreen.width / 2, 105, 0xEEEEEE);
errorScreen.drawCenteredString(fontRenderer, "https://minecraft.curseforge.com/projects/traincraft.", errorScreen.width / 2, 125, 0xEEEEEE);

}
}
Loading

0 comments on commit db95dcb

Please sign in to comment.