Fixed some collision/hitbox issues on the M8D

....well....yh
TheDoctor1138 · Sep 28, 2023 · 299f1bb · 299f1bb
1 parent aa79408
commit 299f1bb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/train/client/render/RenderEnum.java b/src/main/java/train/client/render/RenderEnum.java
@@ -1373,10 +1373,10 @@ public enum RenderEnum {
 	Class205loco( EntityLocoDieselClass205loco.class, new ModelClass205(), "CLass_205_", true, new float[] {-2F, 0.15F, 0F}, new float[] {0F, 180F, 180F}, null, "smoke", 3, new ArrayList<double[]>() {{}}, "", null, 0, false),
 	Class205tso( EntityPassengerClass205tso.class, new ModelClass205tso(), "Class_205_", true, new float[] {-0.075f, 0.15f, 0f}, new float[] {0F, 180F, 180F}, null, "", 0,null, "", null, 0, false),
 	Class205tail( EntityPassengerClass205tail.class, new ModelClass205tail(), "Class_205_", true, new float[] {0f, 0.15f, 0f}, new float[] {0F, 180F, 180F}, null, "", 0,null, "", null, 0, false),
-	M8DNF1Loco(EntityElectricM8DNF1Loco.class, new ModelM8DNF1End(), "m8d_nf1_", true,new float[] {-0.85F, 0.2F, 0F},  new float[] { 0F, 180F, 180F }, null, "", 0, null, "", null, 0, false),
+	M8DNF1Loco(EntityElectricM8DNF1Loco.class, new ModelM8DNF1End(), "m8d_nf1_", true,new float[] {-0.65F, 0.2F, 0F},  new float[] { 0F, 180F, 180F }, null, "", 0, null, "", null, 0, false),
 	M8DNF1MiddleLong(EntityPassengerM8DNF1MiddleLong.class, new ModelM8DNF1Middle1(), "m8d_nf1_", true,new float[] {0F, 0.2F, 0F},  new float[] { 0F, 180F, 180F }, null, "", 0, null, "", null, 0, false),
 	M8DNF1MiddleShort(EntityPassengerM8DNF1MiddleShort.class, new ModelM8DNF1Middle2(), "m8d_nf1_", true,new float[] {0F, 0.2F, 0F},  new float[] { 0F, 180F, 180F }, null, "", 0, null, "", null, 0, false),
-	M8DNF1Tail(EntityPassengerM8DNF1Tail.class, new ModelM8DNF1End(), "m8d_nf1_", true,new float[] {-0.85F, 0.2F, 0F},  new float[] { 0F, 180F, 180F }, null, "", 0, null, "", null, 0, false),
+	M8DNF1Tail(EntityPassengerM8DNF1Tail.class, new ModelM8DNF1End(), "m8d_nf1_", true,new float[] {-0.65F, 0.2F, 0F},  new float[] { 0F, 180F, 180F }, null, "", 0, null, "", null, 0, false),
 	;
 
 	private Class<? extends AbstractTrains> entityClass;

diff --git a/src/main/java/train/common/entity/rollingStock/EntityElectricM8DNF1Loco.java b/src/main/java/train/common/entity/rollingStock/EntityElectricM8DNF1Loco.java
@@ -138,7 +138,7 @@ public boolean interactFirst(EntityPlayer entityplayer) {
     }
     @Override
     public float getOptimalDistance(EntityMinecart cart) {
-        return 0.8F;
+        return 1.0F;
     }
 
     @Override

diff --git a/src/main/java/train/common/entity/rollingStock/EntityPassengerM8DNF1Tail.java b/src/main/java/train/common/entity/rollingStock/EntityPassengerM8DNF1Tail.java
@@ -103,6 +103,6 @@ public boolean isPoweredCart() {
 
     @Override
     public float getOptimalDistance(EntityMinecart cart) {
-        return 0.8F;
+        return 1.0F;
     }
 }
diff --git a/src/main/java/train/common/library/EnumTrains.java b/src/main/java/train/common/library/EnumTrains.java
@@ -589,10 +589,10 @@ public enum EnumTrains {
 	Class205loco("Class205loco", EntityLocoDieselClass205loco.class, ItemIDs.minecartClass205loco.item, "diesel", 600, 121, 0, 55, 0, 100, 0.6, 0.7, 12000, TraincraftUtil.getBytesFromColors(new String[] {"Blue", "Cyan", "Green", "Grey", "LightBlue", "LightGrey", "Lime", "Orange", "Pink", "Red", "Yellow"}), 18, -4, "Pack: B.I.P."),
 	Class205tso("Class205tso", EntityPassengerClass205tso.class, ItemIDs.minecartCLass205tso.item, "passenger", 0, 0, 2, 0 , 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[] {"Blue", "Cyan", "Green", "Grey", "Lime", "Pink", "Red", "Yellow"}), 0, 0, "Pack: B.I.P."),
 	Class205Tail("Class205tail", EntityPassengerClass205tail.class, ItemIDs.minecartClass205tail.item, "passenger", 0, 0, 2, 0 , 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[] {"Blue", "Cyan", "Green", "Grey", "LightBlue", "LightGrey", "Lime", "Orange", "Pink", "Red", "Yellow"}), 0, 0, "Pack: B.I.P."),
-	M8DNF1Loco("M8DNF1Loco", EntityElectricM8DNF1Loco.class, ItemIDs.minecartM8DNF1Loco.item, "electric", 250, 70, 0,20, 0, 100, 0.9, 0.4, 1000, TraincraftUtil.getBytesFromColors(new String[] {"Blue"}), 18, -1.95, "Pack: Trams In Motion"),
+	M8DNF1Loco("M8DNF1Loco", EntityElectricM8DNF1Loco.class, ItemIDs.minecartM8DNF1Loco.item, "electric", 250, 70, 0,20, 0, 100, 0.9, 0.4, 1000, TraincraftUtil.getBytesFromColors(new String[] {"Blue"}), 18, -1.65, "Pack: Trams In Motion"),
 	M8DNF1MiddleLong("M8DNF1Middle1", EntityPassengerM8DNF1MiddleLong.class, ItemIDs.minecartM8DNF1Middlelong.item, "passenger", 0, 0, 1,0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[] {"Blue"}), 18, 0, "Pack: Trams In Motion"),
 	M8DNF1MiddleShort("M8DNF1Middle2", EntityPassengerM8DNF1MiddleShort.class, ItemIDs.minecartM8DNF1Middleshort.item, "passenger", 0, 0, 1,0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[] {"Blue"}), 18, 0, "Pack: Trams In Motion"),
-	M8DNF1Tail("M8DNF1Tail", EntityPassengerM8DNF1Tail.class, ItemIDs.minecartM8DNF1Tail.item, "passenger", 0, 0, 1,0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[] {"Blue"}), 18, -1.95, "Pack: Trams In Motion"),
+	M8DNF1Tail("M8DNF1Tail", EntityPassengerM8DNF1Tail.class, ItemIDs.minecartM8DNF1Tail.item, "passenger", 0, 0, 1,0, 0, 0, 0, 0, 0, TraincraftUtil.getBytesFromColors(new String[] {"Blue"}), 18, -1.65, "Pack: Trams In Motion"),
 	;
 
 //String trainType,int MHP,int maxSpeed, double mass, int fuelConsumption, int waterConsumption, int heatingTime, double accelerationRate, double brakeRate, int tankCapacity, String[] colors,