diff --git a/src/main/java/train/client/render/models/ModelClass374Front.java b/src/main/java/train/client/render/models/ModelClass374Front.java index 33d1ec485..76ca51e41 100644 --- a/src/main/java/train/client/render/models/ModelClass374Front.java +++ b/src/main/java/train/client/render/models/ModelClass374Front.java @@ -123,7 +123,7 @@ private void initbodyModel_1() bodyModel[89] = new ModelRendererTurbo(this, 481, 113, textureX, textureY); // Box 127 bodyModel[90] = new ModelRendererTurbo(this, 377, 113, textureX, textureY); // Box 131 bodyModel[91] = new ModelRendererTurbo(this, 105, 251, textureX, textureY); // Box 109 - bodyModel[92] = new ModelRendererTurbo(this, 201, 121, textureX, textureY); // Box 97 + bodyModel[92] = new ModelRendererTurbo(this, 257, 246, textureX, textureY); // Box 97 bodyModel[93] = new ModelRendererTurbo(this, 297, 105, textureX, textureY); // Box 134 bodyModel[94] = new ModelRendererTurbo(this, 121, 121, textureX, textureY); // Box 99 bodyModel[95] = new ModelRendererTurbo(this, 225, 121, textureX, textureY); // Box 97 @@ -760,7 +760,7 @@ private void initbodyModel_1() bodyModel[91].addShapeBox(0F, 0F, 0F, 3, 6, 6, 0F,-2F, 0F, 0.5F, 0F, 0F, 0.5F, 1F, 0F, -4F, -4F, 0F, -3F, 0F, -3F, 0F, -1F, -3F, 0F, 1F, -4F, -3F, -3F, -4F, -3F); // Box 109 bodyModel[91].setRotationPoint(-59F, -2F, 5F); - bodyModel[92].addShapeBox(0F, 0F, 0F, 5, 4, 9, 0F,-4.5F, -0.4F, 0F, -0.5F, -1.5F, 0F, -0.5F, -1.5F, 0F, -4.5F, -0.4F, 0F, 0F, 0F, 0F, -4F, 0F, 0F, -4F, 0F, 0F, 0F, 0F, 0F); // Box 97 + bodyModel[92].addShapeBox(0F, 0F, 0F, 5, 8, 18, 0F,-4.5F, -0.4F, 0F, -0.5F, -1.5F, 0F, -0.5F, -1.5F, -9F, -4.5F, -0.4F, -9F, 0F, -4F, 0F, -4F, -4F, 0F, -4F, -4F, -9F, 0F, -4F, -9F); // Box 97 bodyModel[92].setRotationPoint(-57F, -6F, -4.5F); bodyModel[93].addShapeBox(0F, 0F, 0F, 3, 3, 2, 0F,0F, 0F, 0F, -1F, 0F, 0F, 0F, 0F, 0F, -3F, 0F, 1F, -2.5F, -0.5F, 0F, 0F, -0.5F, 0F, 2F, -0.5F, 0F, -5F, -0.5F, 1F); // Box 134 @@ -1207,7 +1207,7 @@ private void initbodyModel_1() bodyModel[240].addShapeBox(0F, 0F, 0F, 6, 1, 10, 0F,0F, 0F, -0.5F, -3F, 0F, 0F, -4F, 0F, -6F, 0.3F, 0F, -4.5F, 0F, 0F, -0.5F, -2.8F, 0F, 0F, -3.8F, 0F, -6F, 0.3F, 0F, -4.5F); // Box 97 bodyModel[240].setRotationPoint(-45F, -4F, -10F); - bodyModel[241].addShapeBox(0F, 0F, 0F, 2, 1, 10, 0F,0F, 0F, 0F, -1F, 0F, 0F, -2F, 0F, -5F, 0F, 0F, -5F, 0F, 0F, 0F, -1F, 0F, 0F, -2F, 0F, -5F, 0F, 0F, -5F); // Box 97 + bodyModel[241].addShapeBox(0F, 0F, 0F, 2, 2, 10, 0F,0F, 0F, 0F, -1F, 0F, 0F, -2F, 0F, -5F, 0F, 0F, -5F, 0F, -1F, 0F, -1F, -1F, 0F, -2F, -1F, -5F, 0F, -1F, -5F); // Box 97 bodyModel[241].setRotationPoint(-46F, -4F, -6F); bodyModel[242].addShapeBox(0F, 0F, 0F, 2, 1, 10, 0F,0F, 0F, 0F, -2F, 0F, 0F, -1F, 0F, -5F, 0F, 0F, -5F, 0F, 0F, 0F, -2F, 0F, 0F, -1F, 0F, -5F, 0F, 0F, -5F); // Box 97 diff --git a/src/main/java/train/common/library/EnumTrains.java b/src/main/java/train/common/library/EnumTrains.java index 5694757a1..60b73fb10 100644 --- a/src/main/java/train/common/library/EnumTrains.java +++ b/src/main/java/train/common/library/EnumTrains.java @@ -562,10 +562,10 @@ public enum EnumTrains { Class143Rear("Class143rear", EntityPassengerClass143.class, ItemIDs.minecartClass143Rear.item, "passenger", 3, TraincraftUtil.getBytesFromColors(new String[] {"Black", "Blue", "Cyan", "Green", "Grey", "LightBlue", "LightGrey", "Lime", "Magenta", "Orange", "Pink", "Purple", "Red", "White", "Yellow"}), 18, 0,"Pack: B.I.P."), Class143Middle("Class143middle", EntityPassengerClass143M.class, ItemIDs.minecartClass143Middle.item, "passenger", 2.5, TraincraftUtil.getBytesFromColors(new String[] {"Blue", "Grey", "Magenta", "Pink", "Purple", "White", "Yellow"}), 18, 0,"Pack: B.I.P."), locoDieselCD754("Loco Diesel CD754", EntityLocoDieselCD754.class, ItemIDs.minecartCD754.item,"diesel", 1974, 101, 0, 60, 0, 170, 0.66, 0.96, 5000, TraincraftUtil.getBytesFromColors(new String[]{"Red"}), 13, -2.8), - Class374Front("Class374Front", EntityElectricClass374.class, ItemIDs.minecartClass374Front.item, "electric", 5250, 321, 0,60, 0, 100, 0.7, 0.8, 1000, TraincraftUtil.getBytesFromColors(new String[] {"Blue", "LightBlue", "Cyan"}), 18, -5.1,"Pack: B.I.P."), - Class374PremierPanto("Class374PremierPanto", EntityPassengerClass374PremierPanto.class, ItemIDs.minecartClass374PremierPanto.item, "passenger", 0, 0, 4, 0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[]{"Blue", "LightBlue", "Cyan"}), 0, 0, "Pack: B.I.P." ), - Class374StandardPanto("Class374StandardPanto", EntityPassengerClass374StandardPanto.class, ItemIDs.minecartClass374StandardPanto.item, "passenger", 0, 0, 4, 0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[]{"Blue", "LightBlue", "Cyan"}), 0, 0, "Pack: B.I.P." ), - Class374Buffet("Class374Buffet", EntityPassengerClass374Buffet.class, ItemIDs.minecartClass374Buffet.item, "passenger", 0, 0, 4, 0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[]{"Blue"}), 0, 0, "Pack: B.I.P." ), + Class374Front("Class374Front", EntityElectricClass374.class, ItemIDs.minecartClass374Front.item, "electric", 5250, 321, 0,60, 0, 100, 0.7, 0.8, 1000, TraincraftUtil.getBytesFromColors(new String[] {"Blue", "White", "LightBlue", "Pink"}), 18, -5.1,"Pack: B.I.P."), + Class374PremierPanto("Class374PremierPanto", EntityPassengerClass374PremierPanto.class, ItemIDs.minecartClass374PremierPanto.item, "passenger", 0, 0, 4, 0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[]{"Blue", "LightBlue", "Cyan", "White", "LightGrey", "Grey", "Yellow"}), 0, 0, "Pack: B.I.P." ), + Class374StandardPanto("Class374StandardPanto", EntityPassengerClass374StandardPanto.class, ItemIDs.minecartClass374StandardPanto.item, "passenger", 0, 0, 4, 0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[]{"Blue", "LightBlue", "Cyan", "White", "LightGrey", "Grey", "Yellow", "Orange", "Pink", "Purple"}), 0, 0, "Pack: B.I.P." ), + Class374Buffet("Class374Buffet", EntityPassengerClass374Buffet.class, ItemIDs.minecartClass374Buffet.item, "passenger", 0, 0, 4, 0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[]{"Blue", "White", "LightBlue", "Pink"}), 0, 0, "Pack: B.I.P." ), ; //String trainType,int MHP,int maxSpeed, double mass, int fuelConsumption, int waterConsumption, int heatingTime, double accelerationRate, double brakeRate, int tankCapacity, String[] colors, diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Buffet_LightBlue.png b/src/main/resources/assets/tc/textures/trains/Class_374_Buffet_LightBlue.png new file mode 100644 index 000000000..85fdfadf4 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Buffet_LightBlue.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Buffet_Pink.png b/src/main/resources/assets/tc/textures/trains/Class_374_Buffet_Pink.png new file mode 100644 index 000000000..80859c27e Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Buffet_Pink.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Buffet_White.png b/src/main/resources/assets/tc/textures/trains/Class_374_Buffet_White.png new file mode 100644 index 000000000..c80916fd4 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Buffet_White.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Front_LightBlue.png b/src/main/resources/assets/tc/textures/trains/Class_374_Front_LightBlue.png new file mode 100644 index 000000000..8049fe1ee Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Front_LightBlue.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Front_Pink.png b/src/main/resources/assets/tc/textures/trains/Class_374_Front_Pink.png new file mode 100644 index 000000000..0006be5f3 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Front_Pink.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Front_White.png b/src/main/resources/assets/tc/textures/trains/Class_374_Front_White.png new file mode 100644 index 000000000..7a796fd2d Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Front_White.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_Grey.png b/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_Grey.png new file mode 100644 index 000000000..ced3a9de2 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_Grey.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_LightGrey.png b/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_LightGrey.png new file mode 100644 index 000000000..e7b722f0f Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_LightGrey.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_White.png b/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_White.png new file mode 100644 index 000000000..b31d45152 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_White.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_Yellow.png b/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_Yellow.png new file mode 100644 index 000000000..c0253d4df Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Premier_Panto_Yellow.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Grey.png b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Grey.png new file mode 100644 index 000000000..5dcdbc28b Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Grey.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_LightGrey.png b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_LightGrey.png new file mode 100644 index 000000000..204999a0b Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_LightGrey.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Orange.png b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Orange.png new file mode 100644 index 000000000..761e2ace6 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Orange.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Pink.png b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Pink.png new file mode 100644 index 000000000..9b36a6216 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Pink.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Purple.png b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Purple.png new file mode 100644 index 000000000..72d647e21 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Purple.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_White.png b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_White.png new file mode 100644 index 000000000..a03a3d128 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_White.png differ diff --git a/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Yellow.png b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Yellow.png new file mode 100644 index 000000000..faf3198c8 Binary files /dev/null and b/src/main/resources/assets/tc/textures/trains/Class_374_Standard_Panto_Yellow.png differ