Skip to content

Commit

Permalink
Merge 'TheDoctor1138/TC4.5-1.7.10' into TC4.5-1.7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@EternalBlueFlame
EternalBlueFlame committed Jun 24, 2024
2 parents 309e0ea + 0751a9d commit 9fd5d2b
Show file tree
Hide file tree
Showing 68 changed files with 11,680 additions and 7,496 deletions.
Binary file added raw_models/LU 1996 Stock/LU_96_Stock_Engine.mtb
View file
Binary file not shown.
Binary file added raw_models/LU 1996 Stock/LU_96_Stock_Passenger.mtb
View file
Binary file not shown.
151 changes: 76 additions & 75 deletions src/main/java/train/client/core/handlers/CustomRenderHandler.java
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/main/java/train/client/render/RenderEnum.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ public enum RenderEnum implements TrainRenderRecord {
add(new double[]{2D, -0.4D, 0D});
}
}, 2, true),
locoMRcompound(EntitylocoSteamMRCompound.class, new ModelMidlandcompound(), "LMS_4p_", true, new float[]{-1.95f, 0.1f, 0}, new float[]{0, 180, 180}, null, "largesmoke", 2, new ArrayList<double[]>() {
locoMRcompound(EntitylocoSteamMRCompound.class, new ModelMidlandcompound(), "LMS_4p_", true, new float[]{-1.55f, 0.15f, 0}, new float[]{0, 180, 180}, null, "largesmoke", 2, new ArrayList<double[]>() {
{
add(new double[]{3.5D, 1.5D, 0D});
}
Expand Down Expand Up @@ -818,8 +818,8 @@ public enum RenderEnum implements TrainRenderRecord {
pch120Coach(EntityPassengerPCH120Coach.class, new ModelPCH120Car(), "pch120car_", true, new float[]{0F, 0.01F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
Class345(EntityElectricClass345.class, new ModelClass345(), "Class345_", true, new float[]{-1.5F, 0.17F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
Class345Coach(EntityClass345Coach.class, new ModelClass345Coach(), "Class345_Passenger_", true, new float[]{0F, 0.05F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
LUengine(EntityElectricLUengine.class, new ModelLUengine(), "lu_engine", false, new float[]{-1.0F, 0.16F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
LUpassenger(EntityLUpassenger.class, new ModelLUpassenger(), "lu_passenger", false, new float[]{0F, 0.16F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
LUengine(EntityElectricLUengine.class, new ModelLUengine(), "LU_96_Stock_", true, new float[]{-3.25F, -0.09F, 0.7F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
LUpassenger(EntityLUpassenger.class, new ModelLUpassenger(), "LU_96_Stock_", true, new float[]{-2.12F, -0.09F, 0.7F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
DstockEngine(EntityElectricDstockEngine.class, new ModelDstockEngine(), "D_stock_engine_", true, new float[]{-1.0F, 0.16F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
DstockCar(EntityDstockPassenger.class, new ModelDstockPassenger(), "D_stock_passenger_", true, new float[]{0F, 0.16F, 0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
passengerPS52SeatCoach(EntityPassengerPS52SeatCoach.class, new ModelPS52SeatCoach(), "PS_lightweight_52seat_", true, new float[]{0F, 0.15F, 0.0F}, new float[]{0F, 180F, 180F}, null, "", 0, null, "", null, 0, false),
Expand Down
2,690 changes: 1,393 additions & 1,297 deletions src/main/java/train/client/render/models/ModelDuewagGT6ERLoco.java
View file

Large diffs are not rendered by default.

50 changes: 49 additions & 1 deletion src/main/java/train/client/render/models/ModelDuewagGT6ERTail.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class ModelDuewagGT6ERTail extends ModelConverter//Same as Filename

public ModelDuewagGT6ERTail() //Same as Filename
{
bodyModel = new ModelRendererTurbo[210];
bodyModel = new ModelRendererTurbo[222];

initbodyModel_1();

Expand Down Expand Up @@ -245,6 +245,18 @@ private void initbodyModel_1()
bodyModel[207] = new ModelRendererTurbo(this, 97, 65, textureX, textureY); // Box 433
bodyModel[208] = new ModelRendererTurbo(this, 137, 247, textureX, textureY); // Box 239
bodyModel[209] = new ModelRendererTurbo(this, 321, 247, textureX, textureY); // Box 325
bodyModel[210] = new ModelRendererTurbo(this, 177, 85, textureX, textureY); // Box 24
bodyModel[211] = new ModelRendererTurbo(this, 249, 105, textureX, textureY); // Box 457
bodyModel[212] = new ModelRendererTurbo(this, 177, 85, textureX, textureY); // Box 458
bodyModel[213] = new ModelRendererTurbo(this, 289, 105, textureX, textureY); // Box 461
bodyModel[214] = new ModelRendererTurbo(this, 249, 108, textureX, textureY); // Box 423
bodyModel[215] = new ModelRendererTurbo(this, 249, 108, textureX, textureY); // Box 424
bodyModel[216] = new ModelRendererTurbo(this, 267, 108, textureX, textureY); // Box 425
bodyModel[217] = new ModelRendererTurbo(this, 267, 108, textureX, textureY); // Box 426
bodyModel[218] = new ModelRendererTurbo(this, 249, 108, textureX, textureY); // Box 435
bodyModel[219] = new ModelRendererTurbo(this, 249, 108, textureX, textureY); // Box 436
bodyModel[220] = new ModelRendererTurbo(this, 267, 108, textureX, textureY); // Box 437
bodyModel[221] = new ModelRendererTurbo(this, 267, 108, textureX, textureY); // Box 438

bodyModel[0].addShapeBox(0F, 0F, 0F, 4, 1, 16, 0F,2F, 0F, 0F, 0F, 0F, 1F, 0F, 0F, 0F, 2F, 0F, -0.25F, 2F, 0F, 0F, 0F, 0F, 1F, 0F, 0F, 0F, 2F, 0F, -0.25F); // Box 9
bodyModel[0].setRotationPoint(-17.5F, 4F, -7F);
Expand Down Expand Up @@ -875,5 +887,41 @@ private void initbodyModel_1()

bodyModel[209].addShapeBox(0F, 0F, 0F, 90, 7, 1, 0F,0F, 0F, 0F, -50F, 0F, 0F, -50F, 0F, -0.9F, 0F, 0F, -0.9F, 0F, -3F, 0F, -50F, -3F, 0F, -50F, -3F, -0.9F, 0F, -3F, -0.9F); // Box 325
bodyModel[209].setRotationPoint(-12F, -22.5F, 8.7F);

bodyModel[210].addBox(0F, 0F, 0F, 1, 1, 14, 0F); // Box 24
bodyModel[210].setRotationPoint(3F, 8.5F, -7F);

bodyModel[211].addShapeBox(0F, 0F, 0F, 18, 1, 1, 0F,0F, 0F, 0F, 0F, 0F, 0F, 1F, 0F, 0F, 1F, 0F, 0F, 0F, 0F, 0F, 0F, 0F, 0F, 1F, 0F, 0F, 1F, 0F, 0F); // Box 457
bodyModel[211].setRotationPoint(-15F, 8.5F, -8F);

bodyModel[212].addBox(0F, 0F, 0F, 1, 1, 14, 0F); // Box 458
bodyModel[212].setRotationPoint(-16F, 8.5F, -7F);

bodyModel[213].addShapeBox(0F, 0F, 0F, 18, 1, 1, 0F,1F, 0F, 0F, 1F, 0F, 0F, 0F, 0F, 0F, 0F, 0F, 0F, 1F, 0F, 0F, 1F, 0F, 0F, 0F, 0F, 0F, 0F, 0F, 0F); // Box 461
bodyModel[213].setRotationPoint(-15F, 8.5F, 7F);

bodyModel[214].addShapeBox(0F, 0F, 0F, 4, 1, 1, 0F,-2.5F, 0F, -0.5F, -1F, 0F, -0.5F, -1F, 0F, 0F, -2.5F, 0F, 0F, 0F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, 0F, 0F, 0F, 0F, 0F); // Box 423
bodyModel[214].setRotationPoint(-12.5F, 7.5F, -8F);

bodyModel[215].addShapeBox(0F, 0F, 0F, 4, 1, 1, 0F,-1F, 0F, -0.5F, -2.5F, 0F, -0.5F, -2.5F, 0F, 0F, -1F, 0F, 0F, 0F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, 0F, 0F, 0F, 0F, 0F); // Box 424
bodyModel[215].setRotationPoint(-3.5F, 7.5F, -8F);

bodyModel[216].addShapeBox(0F, 0F, 0F, 1, 2, 1, 0F,0F, 0F, -0.5F, -0.5F, 0F, -0.5F, -0.5F, 0F, 0F, 0F, 0F, 0F, 0F, 0F, -0.5F, -0.5F, 0F, -0.5F, -0.5F, 0F, 0F, 0F, 0F, 0F); // Box 425
bodyModel[216].setRotationPoint(-2.5F, 5.5F, -8F);

bodyModel[217].addShapeBox(0F, 0F, 0F, 1, 2, 1, 0F,-0.5F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, 0F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, 0F, 0F, -0.5F, 0F, 0F); // Box 426
bodyModel[217].setRotationPoint(-10.5F, 5.5F, -8F);

bodyModel[218].addShapeBox(0F, 0F, 0F, 4, 1, 1, 0F,-1F, 0F, -0.5F, -2.5F, 0F, -0.5F, -2.5F, 0F, 0F, -1F, 0F, 0F, 0F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, 0F, 0F, 0F, 0F, 0F); // Box 435
bodyModel[218].setRotationPoint(-3.5F, 7.5F, 6.5F);

bodyModel[219].addShapeBox(0F, 0F, 0F, 4, 1, 1, 0F,-2.5F, 0F, -0.5F, -1F, 0F, -0.5F, -1F, 0F, 0F, -2.5F, 0F, 0F, 0F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, 0F, 0F, 0F, 0F, 0F); // Box 436
bodyModel[219].setRotationPoint(-12.5F, 7.5F, 6.5F);

bodyModel[220].addShapeBox(0F, 0F, 0F, 1, 2, 1, 0F,-0.5F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, 0F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, -0.5F, 0F, 0F, -0.5F, 0F, 0F, 0F, -0.5F, 0F, 0F); // Box 437
bodyModel[220].setRotationPoint(-10.5F, 5.5F, 6.5F);

bodyModel[221].addShapeBox(0F, 0F, 0F, 1, 2, 1, 0F,0F, 0F, -0.5F, -0.5F, 0F, -0.5F, -0.5F, 0F, 0F, 0F, 0F, 0F, 0F, 0F, -0.5F, -0.5F, 0F, -0.5F, -0.5F, 0F, 0F, 0F, 0F, 0F); // Box 438
bodyModel[221].setRotationPoint(-2.5F, 5.5F, 6.5F);
}
}
Loading

0 comments on commit 9fd5d2b

Please sign in to comment.