diff --git a/src/main/java/train/common/api/AbstractControlCar.java b/src/main/java/train/common/api/AbstractControlCar.java index f270feeb61..cd1b9e4b4e 100644 --- a/src/main/java/train/common/api/AbstractControlCar.java +++ b/src/main/java/train/common/api/AbstractControlCar.java @@ -67,10 +67,7 @@ public AbstractControlCar(World world) } } - public AbstractControlCar(World world, double d, double d1, double d2) - { - super(world); - } + @Override protected void writeEntityToNBT(NBTTagCompound nbttagcompound) diff --git a/src/main/java/train/common/api/AbstractTrains.java b/src/main/java/train/common/api/AbstractTrains.java index b10aedefce..917a322906 100644 --- a/src/main/java/train/common/api/AbstractTrains.java +++ b/src/main/java/train/common/api/AbstractTrains.java @@ -209,9 +209,22 @@ public AbstractTrains(World world) { } } - public AbstractTrains(World world, double x, double y, double z) { - this(world); - this.setPosition(x, y, z); + /** + * Called to set up initial pos and motion + * ONLY CALLED BY SERVER SIDE + * @param x + * @param y + * @param z + */ + public void SetupRollingStockSpawn(double x, double y, double z) + { + setPosition(x, y + (double)yOffset, z); + motionX = 0.0D; + motionY = 0.0D; + motionZ = 0.0D; + prevPosX = x; + prevPosY = y; + prevPosZ = z; } @Override diff --git a/src/main/java/train/common/api/AbstractWorkCart.java b/src/main/java/train/common/api/AbstractWorkCart.java index 7ba3468a86..e9715b325c 100644 --- a/src/main/java/train/common/api/AbstractWorkCart.java +++ b/src/main/java/train/common/api/AbstractWorkCart.java @@ -26,9 +26,6 @@ public abstract class AbstractWorkCart extends EntityRollingStock{ public AbstractWorkCart(World world) { super(world); } - public AbstractWorkCart(World world, double d, double d1, double d2) { - super(world, d, d1, d2); - } @Override public void onUpdate() { super.onUpdate(); diff --git a/src/main/java/train/common/api/DieselTrain.java b/src/main/java/train/common/api/DieselTrain.java index 40dca6d872..8350dcba2d 100644 --- a/src/main/java/train/common/api/DieselTrain.java +++ b/src/main/java/train/common/api/DieselTrain.java @@ -47,9 +47,6 @@ private DieselTrain(World world, FluidStack filter, String[] multiFilter) { this.dataWatcher.addObject(27, 0); this.dataWatcher.addObject(5, ""); } - public DieselTrain(World world, double d, double d1, double d2) { - super(world, d, d1, d2); - } @Override public int getSizeInventory() { diff --git a/src/main/java/train/common/api/ElectricTrain.java b/src/main/java/train/common/api/ElectricTrain.java index 8a1e658b66..de91853e33 100644 --- a/src/main/java/train/common/api/ElectricTrain.java +++ b/src/main/java/train/common/api/ElectricTrain.java @@ -26,9 +26,6 @@ public ElectricTrain(World world) { Ignite = false; timeSinceIgnited = 0; } - public ElectricTrain(World world, double x, double y, double z){ - super(world,x,y,z); - } @Override//todo:why was this so much? public int getSizeInventory() { diff --git a/src/main/java/train/common/api/EntityRollingStock.java b/src/main/java/train/common/api/EntityRollingStock.java index a1c9548400..5ba562464e 100644 --- a/src/main/java/train/common/api/EntityRollingStock.java +++ b/src/main/java/train/common/api/EntityRollingStock.java @@ -144,25 +144,18 @@ public EntityRollingStock(World world) { } @Override - public GameProfile getOwner() { - return CartTools.getCartOwner(this); - } - - public EntityRollingStock(World world, double d, double d1, double d2) { - super(world, d, d1, d2); - if(world==null){return;} - setPosition(d, d1, d2); - initRollingStock(world); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; + public void SetupRollingStockSpawn(double x, double y, double z) + { + super.SetupRollingStockSpawn(x, y, z); consist = new ArrayList(); consist.add(this); } + @Override + public GameProfile getOwner() { + return CartTools.getCartOwner(this); + } + public void initRollingStock(World world) { dataWatcher.addObject(20, 0);//heat dataWatcher.addObject(14, 0); diff --git a/src/main/java/train/common/api/Freight.java b/src/main/java/train/common/api/Freight.java index 535d68524f..41b5fa192a 100644 --- a/src/main/java/train/common/api/Freight.java +++ b/src/main/java/train/common/api/Freight.java @@ -20,10 +20,6 @@ public Freight(World world) { dataWatcher.addObject(22, 0); cargoItems = new ItemStack[getSizeInventory()]; } - public Freight(World world, double d, double d1, double d2) { - super(world, d, d1, d2); - cargoItems = new ItemStack[getSizeInventory()]; - } @Override public boolean attackEntityFrom(DamageSource damagesource, float i) { diff --git a/src/main/java/train/common/api/LiquidTank.java b/src/main/java/train/common/api/LiquidTank.java index 0a1a8211c5..e9e480760b 100644 --- a/src/main/java/train/common/api/LiquidTank.java +++ b/src/main/java/train/common/api/LiquidTank.java @@ -44,9 +44,6 @@ private LiquidTank(@Nullable FluidStack liquid, World world) { dataWatcher.addObject(22, ""); } - public LiquidTank(World world, double d, double d1, double d2) { - super(world, d, d1, d2); - } public int getAmount() { return (this.dataWatcher.getWatchableObjectInt(18)); diff --git a/src/main/java/train/common/api/Locomotive.java b/src/main/java/train/common/api/Locomotive.java index 7fb5d9f888..c34b9c87a2 100644 --- a/src/main/java/train/common/api/Locomotive.java +++ b/src/main/java/train/common/api/Locomotive.java @@ -160,11 +160,6 @@ public Locomotive(World world) { fuelTrain = 0; } - public Locomotive(World world, double d, double d1, double d2) { - super(world, d, d1, d2); - fuelTrain = 0; - } - /** * this is basically NBT for entity spawn, to keep data between client and server in sync because some data is not automatically shared. */ diff --git a/src/main/java/train/common/api/SteamTrain.java b/src/main/java/train/common/api/SteamTrain.java index 4a25deec76..91be308277 100644 --- a/src/main/java/train/common/api/SteamTrain.java +++ b/src/main/java/train/common/api/SteamTrain.java @@ -39,9 +39,6 @@ public SteamTrain(World world, FluidStack filter) { dataWatcher.addObject(4, 0); this.dataWatcher.addObject(27, 0); } - public SteamTrain(World world, double d, double d1, double d2) { - super(world, d, d1, d2); - } @Override public int getSizeInventory() { diff --git a/src/main/java/train/common/api/Tender.java b/src/main/java/train/common/api/Tender.java index c28a521423..5ea07b5966 100644 --- a/src/main/java/train/common/api/Tender.java +++ b/src/main/java/train/common/api/Tender.java @@ -32,9 +32,7 @@ public Tender(World world, Fluid fluid, int quantity) { public Tender(World world){ super(world); } - public Tender(World world, double x, double y, double z){ - super(world,x,y,z); - } + public Tender(World world, Fluid fluid, int quantity, FluidStack filter) { this(new FluidStack(fluid, quantity), world, filter); } diff --git a/src/main/java/train/common/api/TrainRecord.java b/src/main/java/train/common/api/TrainRecord.java index 49d75934d7..b328f842b1 100644 --- a/src/main/java/train/common/api/TrainRecord.java +++ b/src/main/java/train/common/api/TrainRecord.java @@ -210,7 +210,9 @@ public AbstractTrains getEntity(World world, double x, double y, double z) { //if (world.isRemote) { //entityClass.getConstructor(World.class).newInstance(world); //} else { - return (AbstractTrains) entityClass.getConstructor(World.class, double.class, double.class, double.class).newInstance(world, x, y, z); + AbstractTrains abstractTrains = (AbstractTrains) entityClass.getConstructor(World.class).newInstance(world); + abstractTrains.SetupRollingStockSpawn(x, y, z); + return abstractTrains; //} } catch (IllegalArgumentException | SecurityException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { diff --git a/src/main/java/train/common/entity/rollingStock/EntityPassengerCar1.java b/src/main/java/train/common/entity/rollingStock/EntityPassengerCar1.java index b32923e63d..22665194bf 100644 --- a/src/main/java/train/common/entity/rollingStock/EntityPassengerCar1.java +++ b/src/main/java/train/common/entity/rollingStock/EntityPassengerCar1.java @@ -28,10 +28,6 @@ public class EntityPassengerCar1 extends EntityRollingStock implements IPassenge public static final Item thisItem = new ItemRollingStock(new EntityPassengerCar1(null), Info.modID, Traincraft.tcTab); - - public EntityPassengerCar1(World world, double d, double d1, double d2) { - super(world, d, d1, d2); - } public EntityPassengerCar1(World world){ super(world); } diff --git a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCaboose.java b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCaboose.java index 9e9f1ff0d4..89aaef83f2 100644 --- a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCaboose.java +++ b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCaboose.java @@ -13,17 +13,6 @@ public EntityCaboose(World world) { super(world); } - public EntityCaboose(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } - @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCaboose3.java b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCaboose3.java index 955972627f..f0049e5aac 100644 --- a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCaboose3.java +++ b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCaboose3.java @@ -13,17 +13,6 @@ public EntityCaboose3(World world) { super(world); } - public EntityCaboose3(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } - @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseLogging.java b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseLogging.java index 26c5a29323..994290162d 100644 --- a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseLogging.java +++ b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseLogging.java @@ -22,18 +22,6 @@ public void initCabooseWorkCart() { currentItemBurnTime = 0; furnaceCookTime = 0; } - - public EntityCabooseLogging(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } - @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseLoggingPRR.java b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseLoggingPRR.java index 2237e6ca68..8a7aef38e4 100644 --- a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseLoggingPRR.java +++ b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseLoggingPRR.java @@ -23,17 +23,6 @@ public void initCabooseWorkCart() { furnaceCookTime = 0; } - public EntityCabooseLoggingPRR(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } - @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseWorkCart.java b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseWorkCart.java index d66a66ca24..5e4c527113 100644 --- a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseWorkCart.java +++ b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityCabooseWorkCart.java @@ -23,17 +23,6 @@ public void initCabooseWorkCart() { furnaceCookTime = 0; } - public EntityCabooseWorkCart(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } - @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityGWRBrakeVan.java b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityGWRBrakeVan.java index 7d63f77970..bb4ca71af7 100644 --- a/src/main/java/train/common/entity/rollingStockOld/caboose/EntityGWRBrakeVan.java +++ b/src/main/java/train/common/entity/rollingStockOld/caboose/EntityGWRBrakeVan.java @@ -16,17 +16,6 @@ public EntityGWRBrakeVan(World world) { initWorkCart(); } - public EntityGWRBrakeVan(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } - public void initWorkCart() { furnaceItemStacks = new ItemStack[3]; furnaceBurnTime = 0; diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDiesel44TonSwitcher.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDiesel44TonSwitcher.java index a92ec92afc..cb585f6e4a 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDiesel44TonSwitcher.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDiesel44TonSwitcher.java @@ -15,16 +15,7 @@ public EntityLocoDiesel44TonSwitcher(World world) { } - public EntityLocoDiesel44TonSwitcher(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselBamboo.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselBamboo.java index aa89f3a35c..4e365b8690 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselBamboo.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselBamboo.java @@ -15,16 +15,7 @@ public EntityLocoDieselBamboo(World world) { } - public EntityLocoDieselBamboo(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselCD742.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselCD742.java index 7e29761d97..158de7480a 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselCD742.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselCD742.java @@ -15,16 +15,7 @@ public EntityLocoDieselCD742(World world) { } - public EntityLocoDieselCD742(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselChME3.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselChME3.java index 7c7e0ad57e..65ad6bda3f 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselChME3.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselChME3.java @@ -15,16 +15,7 @@ public EntityLocoDieselChME3(World world) { } - public EntityLocoDieselChME3(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselClass66.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselClass66.java index ea6e7bf74c..1223d9d9c1 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselClass66.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselClass66.java @@ -15,16 +15,7 @@ public EntityLocoDieselClass66(World world) { } - public EntityLocoDieselClass66(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselDD35A.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselDD35A.java index cfe1da808b..d59605fa57 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselDD35A.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselDD35A.java @@ -15,16 +15,7 @@ public EntityLocoDieselDD35A(World world) { } - public EntityLocoDieselDD35A(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselDeltic.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselDeltic.java index 86d96327d3..db9ca6fca8 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselDeltic.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselDeltic.java @@ -15,16 +15,7 @@ public EntityLocoDieselDeltic(World world) { } - public EntityLocoDieselDeltic(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselEMDF3.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselEMDF3.java index 33d4ca5b31..9973d73962 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselEMDF3.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselEMDF3.java @@ -15,16 +15,7 @@ public EntityLocoDieselEMDF3(World world) { } - public EntityLocoDieselEMDF3(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselEMDF7.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselEMDF7.java index 8b990e70ec..111a9667d0 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselEMDF7.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselEMDF7.java @@ -15,16 +15,7 @@ public EntityLocoDieselEMDF7(World world) { } - public EntityLocoDieselEMDF7(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselFOLM1.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselFOLM1.java index 7c20c16b20..1235ed9d42 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselFOLM1.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselFOLM1.java @@ -15,16 +15,7 @@ public EntityLocoDieselFOLM1(World world) { } - public EntityLocoDieselFOLM1(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselFOLM1B.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselFOLM1B.java index 97f9c2c707..f3279acd17 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselFOLM1B.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselFOLM1B.java @@ -15,16 +15,7 @@ public EntityLocoDieselFOLM1B(World world) { super(world, LiquidManager.dieselFilter()); } - public EntityLocoDieselFOLM1B(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void updateRiderPosition() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselGP7Red.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselGP7Red.java index a994a2a1d1..7bc2843f63 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselGP7Red.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselGP7Red.java @@ -15,16 +15,7 @@ public EntityLocoDieselGP7Red(World world) { } - public EntityLocoDieselGP7Red(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselIC4_DSB_MG.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselIC4_DSB_MG.java index 4433d8e909..20dabf4405 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselIC4_DSB_MG.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselIC4_DSB_MG.java @@ -15,16 +15,7 @@ public EntityLocoDieselIC4_DSB_MG(World world) { } - public EntityLocoDieselIC4_DSB_MG(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselKof_DB.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselKof_DB.java index d85a9e6c11..2614a16bd0 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselKof_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselKof_DB.java @@ -15,16 +15,7 @@ public EntityLocoDieselKof_DB(World world) { } - public EntityLocoDieselKof_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselMILW_H1044.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselMILW_H1044.java index aff70062b9..279a28dab7 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselMILW_H1044.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselMILW_H1044.java @@ -15,16 +15,7 @@ public EntityLocoDieselMILW_H1044(World world) { } - public EntityLocoDieselMILW_H1044(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselSD40.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselSD40.java index 4a9461f4e7..b808b0bd84 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselSD40.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselSD40.java @@ -15,16 +15,7 @@ public EntityLocoDieselSD40(World world) { } - public EntityLocoDieselSD40(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselSD70.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselSD70.java index 9eabd60cc5..100cb50476 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselSD70.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselSD70.java @@ -13,16 +13,7 @@ public EntityLocoDieselSD70(World world) { } - public EntityLocoDieselSD70(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public float[][] getRiderOffsets() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselShunter.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselShunter.java index d2e4a5f1e6..e6ef45fde0 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselShunter.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselShunter.java @@ -15,16 +15,7 @@ public EntityLocoDieselShunter(World world) { } - public EntityLocoDieselShunter(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselV60_DB.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselV60_DB.java index 0a4d144ebd..d9f97642c2 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselV60_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselV60_DB.java @@ -15,16 +15,7 @@ public EntityLocoDieselV60_DB(World world) { } - public EntityLocoDieselV60_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselWLs40.java b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselWLs40.java index f7edb76a7c..fac73cead1 100644 --- a/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselWLs40.java +++ b/src/main/java/train/common/entity/rollingStockOld/diesel/EntityLocoDieselWLs40.java @@ -15,16 +15,7 @@ public EntityLocoDieselWLs40(World world) { } - public EntityLocoDieselWLs40(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBP4.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBP4.java index d79a497cb7..b2fea79e56 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBP4.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBP4.java @@ -13,16 +13,7 @@ public EntityLocoElectricBP4(World world) { super(world); } - public EntityLocoElectricBP4(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBR185.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBR185.java index 7d2ec30fcc..c9d56626db 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBR185.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBR185.java @@ -13,16 +13,7 @@ public EntityLocoElectricBR185(World world) { super(world); } - public EntityLocoElectricBR185(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBR_E69.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBR_E69.java index 305f0b9a22..c6a15695dd 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBR_E69.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricBR_E69.java @@ -13,16 +13,7 @@ public EntityLocoElectricBR_E69(World world) { super(world); } - public EntityLocoElectricBR_E69(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricCD151.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricCD151.java index 8fcb97a8d9..4f17c6cf09 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricCD151.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricCD151.java @@ -13,16 +13,7 @@ public EntityLocoElectricCD151(World world) { super(world); } - public EntityLocoElectricCD151(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricClass85.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricClass85.java index 5fa6abfed3..8affc83f9c 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricClass85.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricClass85.java @@ -13,16 +13,7 @@ public EntityLocoElectricClass85(World world) { super(world); } - public EntityLocoElectricClass85(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricE103.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricE103.java index 9fb189e475..d4d196ec8e 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricE103.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricE103.java @@ -13,16 +13,7 @@ public EntityLocoElectricE103(World world) { super(world); } - public EntityLocoElectricE103(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricE10_DB.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricE10_DB.java index 72d042d32d..926db92bae 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricE10_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricE10_DB.java @@ -13,16 +13,7 @@ public EntityLocoElectricE10_DB(World world) { super(world); } - public EntityLocoElectricE10_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricHighSpeedZeroED.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricHighSpeedZeroED.java index 02f2aae991..f1cc44df49 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricHighSpeedZeroED.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricHighSpeedZeroED.java @@ -11,16 +11,7 @@ public EntityLocoElectricHighSpeedZeroED(World world) { super(world); } - public EntityLocoElectricHighSpeedZeroED(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public float[][] getRiderOffsets() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricICE1.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricICE1.java index 3ef34ee00d..ab689b0953 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricICE1.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricICE1.java @@ -13,16 +13,7 @@ public EntityLocoElectricICE1(World world) { super(world); } - public EntityLocoElectricICE1(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricMinetrain.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricMinetrain.java index bc5a83f579..158afc913b 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricMinetrain.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricMinetrain.java @@ -13,16 +13,7 @@ public EntityLocoElectricMinetrain(World world) { super(world); } - public EntityLocoElectricMinetrain(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricTramNY.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricTramNY.java index 34588a50fe..922a741fac 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricTramNY.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricTramNY.java @@ -13,16 +13,7 @@ public EntityLocoElectricTramNY(World world) { super(world); } - public EntityLocoElectricTramNY(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricTramWood.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricTramWood.java index 00beab0838..7aff510c1b 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricTramWood.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricTramWood.java @@ -13,16 +13,7 @@ public EntityLocoElectricTramWood(World world) { super(world); } - public EntityLocoElectricTramWood(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + diff --git a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricVL10.java b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricVL10.java index 1e8078a3b3..4d2a2e5686 100644 --- a/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricVL10.java +++ b/src/main/java/train/common/entity/rollingStockOld/electric/EntityLocoElectricVL10.java @@ -13,16 +13,7 @@ public EntityLocoElectricVL10(World world) { super(world); } - public EntityLocoElectricVL10(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityBoxCartPRR.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityBoxCartPRR.java index a296b59bc4..d5901a68d1 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityBoxCartPRR.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityBoxCartPRR.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityBoxCartPRR(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public double getMountedYOffset() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityBoxCartUS.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityBoxCartUS.java index d4ebcd91c3..1dce80746d 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityBoxCartUS.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityBoxCartUS.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityBoxCartUS(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public double getMountedYOffset() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityBulkheadFlatCart.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityBulkheadFlatCart.java index c7e2242619..4b4aaedd98 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityBulkheadFlatCart.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityBulkheadFlatCart.java @@ -27,17 +27,7 @@ public void initBulkheadFlat() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityBulkheadFlatCart(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } @Override public void onUpdate() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCarLogs_DB.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCarLogs_DB.java index 99efdb68dd..90fedb7f04 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCarLogs_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCarLogs_DB.java @@ -31,16 +31,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFlatCarLogs_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCarRails_DB.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCarRails_DB.java index 06ce56c18e..f2030be75d 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCarRails_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCarRails_DB.java @@ -28,16 +28,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFlatCarRails_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCartWoodUS.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCartWoodUS.java index 473efda60b..fb51228641 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCartWoodUS.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFlatCartWoodUS.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFlatCartWoodUS(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean interactFirst(EntityPlayer entityplayer) { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreight100TonHopper.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreight100TonHopper.java index f1fba1b288..5968925be9 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreight100TonHopper.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreight100TonHopper.java @@ -27,16 +27,7 @@ public void initFreightGrain() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreight100TonHopper(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightASTFAutorack.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightASTFAutorack.java index aaf6b4c2e3..d36c5112f2 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightASTFAutorack.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightASTFAutorack.java @@ -26,16 +26,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightASTFAutorack(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public double getMountedYOffset() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightBaggageMILW.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightBaggageMILW.java index cf17878fb2..afac0aa060 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightBaggageMILW.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightBaggageMILW.java @@ -26,16 +26,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightBaggageMILW(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public double getMountedYOffset() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightBamboo.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightBamboo.java index 5eb92c8941..21a8132282 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightBamboo.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightBamboo.java @@ -25,16 +25,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightBamboo(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCart.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCart.java index dea81059ce..05a6d622f4 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCart.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCart.java @@ -25,16 +25,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightCart(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCart2.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCart2.java index 34cc3ade76..a43f962621 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCart2.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCart2.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightCart2(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartL.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartL.java index 28df3068f5..49b2a0a4a7 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartL.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartL.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightCartL(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartSmall.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartSmall.java index f5289f2034..7ee348eb48 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartSmall.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartSmall.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightCartSmall(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartUS.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartUS.java index 18e5b3590f..f8dc67e70e 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartUS.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCartUS.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightCartUS(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Empty.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Empty.java index e0e5373aae..f071ae8ead 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Empty.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Empty.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightCenterbeam_Empty(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Wood_1.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Wood_1.java index d7576c411d..644660ec0c 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Wood_1.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Wood_1.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightCenterbeam_Wood_1(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Wood_2.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Wood_2.java index 06851dfaa9..76c4bfb1b3 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Wood_2.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightCenterbeam_Wood_2.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightCenterbeam_Wood_2(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightClosed.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightClosed.java index c9ad9f8a8e..9e438cfa2f 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightClosed.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightClosed.java @@ -33,16 +33,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightClosed(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightDenverRioGrande.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightDenverRioGrande.java index 1b6eee2ca4..a9d1078f13 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightDenverRioGrande.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightDenverRioGrande.java @@ -26,16 +26,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightDenverRioGrande(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public double getMountedYOffset() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightDepressedFlatbed.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightDepressedFlatbed.java index 956cd80af0..61d62c906d 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightDepressedFlatbed.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightDepressedFlatbed.java @@ -25,16 +25,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightDepressedFlatbed(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGS4_Baggage.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGS4_Baggage.java index 4410879dda..0b7eff08c7 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGS4_Baggage.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGS4_Baggage.java @@ -26,16 +26,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightGS4_Baggage(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGTNG.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGTNG.java index f691d76ebe..a9241f21b4 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGTNG.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGTNG.java @@ -24,16 +24,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightGTNG(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGermanPost.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGermanPost.java index 34947b518a..c4e4edfc3a 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGermanPost.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGermanPost.java @@ -25,16 +25,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightGermanPost(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGondola_DB.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGondola_DB.java index 86fce02a35..682bcd7aab 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGondola_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGondola_DB.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightGondola_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGrain.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGrain.java index 3c5bb55ee2..0042659701 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGrain.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightGrain.java @@ -28,16 +28,7 @@ public void initFreightGrain() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightGrain(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHeavyweight.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHeavyweight.java index 0e7ae92752..fc749dec0c 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHeavyweight.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHeavyweight.java @@ -26,16 +26,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightHeavyweight(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public double getMountedYOffset() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHeavyweightBaggage.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHeavyweightBaggage.java index 30b34176ca..76bd481847 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHeavyweightBaggage.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHeavyweightBaggage.java @@ -27,16 +27,7 @@ public void initFreightGrain() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightHeavyweightBaggage(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHopperUS.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHopperUS.java index ffc0495015..01fadc8ee6 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHopperUS.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightHopperUS.java @@ -27,16 +27,7 @@ public void initFreightGrain() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightHopperUS(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightIceWagon.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightIceWagon.java index bbe961d362..e9f98131ef 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightIceWagon.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightIceWagon.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightIceWagon(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightKClassRailBox.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightKClassRailBox.java index f3fbcefcef..fab1d4d43a 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightKClassRailBox.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightKClassRailBox.java @@ -27,16 +27,7 @@ public void initFreightGrain() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightKClassRailBox(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightLongCoveredHopper.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightLongCoveredHopper.java index 36cc3e3bf0..cb28fde997 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightLongCoveredHopper.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightLongCoveredHopper.java @@ -27,16 +27,7 @@ public void initFreightGrain() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightLongCoveredHopper(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightMinetrain.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightMinetrain.java index 945f3a518a..756070e49f 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightMinetrain.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightMinetrain.java @@ -24,16 +24,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightMinetrain(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightOpen2.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightOpen2.java index 7cfc286933..764ff95830 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightOpen2.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightOpen2.java @@ -26,16 +26,7 @@ public void initFreightCart() { freightInventorySize = getSizeInventory(); cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightOpen2(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightOpenWagon.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightOpenWagon.java index 5872eab5c5..f68463db23 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightOpenWagon.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightOpenWagon.java @@ -28,16 +28,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightOpenWagon(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightShortCoveredHopper.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightShortCoveredHopper.java index c6af0bc9b2..73f90f9fcf 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightShortCoveredHopper.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightShortCoveredHopper.java @@ -27,16 +27,7 @@ public void initFreightGrain() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightShortCoveredHopper(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightSlateWagon.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightSlateWagon.java index bd1a4046ff..1a339b81ef 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightSlateWagon.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightSlateWagon.java @@ -27,16 +27,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightSlateWagon(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightTrailer.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightTrailer.java index e5c9994ee0..4574ba5a74 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightTrailer.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightTrailer.java @@ -26,16 +26,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightTrailer(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWagenDB.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWagenDB.java index 8ff24225d0..fb968a6630 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWagenDB.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWagenDB.java @@ -27,16 +27,7 @@ public void initFreightWood() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightWagenDB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWellcar.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWellcar.java index 399f442af3..5e48d58d88 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWellcar.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWellcar.java @@ -25,16 +25,7 @@ public void initFreightCart() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightWellcar(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWood.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWood.java index d0d32b295a..33219b06b7 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWood.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWood.java @@ -27,16 +27,7 @@ public void initFreightWood() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightWood(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void onUpdate() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWood2.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWood2.java index 0aa966236e..40ffb89088 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWood2.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityFreightWood2.java @@ -27,16 +27,7 @@ public void initFreightWood() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityFreightWood2(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankLava.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankLava.java index 9ef0099cb8..9727f9fa14 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankLava.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankLava.java @@ -27,16 +27,7 @@ public void initFreightWater() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityTankLava(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon.java index 393d9dbcba..355602a9a3 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon.java @@ -24,16 +24,7 @@ public void initFreightWater() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityTankWagon(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon2.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon2.java index 2d37195f01..9910c9fb71 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon2.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon2.java @@ -22,16 +22,7 @@ public void initFreightWater() { freightInventorySize = 2; cargoItems = new ItemStack[freightInventorySize]; } - public EntityTankWagon2(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagonThreeDome.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagonThreeDome.java index 90ccb21bb3..933b92f9d9 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagonThreeDome.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagonThreeDome.java @@ -24,16 +24,7 @@ public void initFreightWater() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityTankWagonThreeDome(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagonUS.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagonUS.java index d1f1beec66..d035caf147 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagonUS.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagonUS.java @@ -24,16 +24,7 @@ public void initFreightWater() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityTankWagonUS(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon_DB.java b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon_DB.java index 556cd44288..3ab9128fd8 100644 --- a/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/freight/EntityTankWagon_DB.java @@ -24,16 +24,7 @@ public void initFreightWater() { cargoItems = new ItemStack[freightInventorySize]; } - public EntityTankWagon_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCar_DB.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCar_DB.java index 7410802bff..e617687fd0 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCar_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCar_DB.java @@ -13,16 +13,7 @@ public EntityFlatCar_DB(World world) { super(world); } - public EntityFlatCar_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + /*@Override public void onUpdate(){ diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCart.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCart.java index 2067c02e0d..fc3f7bc4b2 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCart.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCart.java @@ -13,16 +13,7 @@ public EntityFlatCart(World world) { super(world); } - public EntityFlatCart(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCartSU.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCartSU.java index 177890d33f..320dfce025 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCartSU.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCartSU.java @@ -13,16 +13,7 @@ public EntityFlatCartSU(World world) { super(world); } - public EntityFlatCartSU(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + /*@Override public void onUpdate(){ diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCartUS.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCartUS.java index 42bea163e3..7c2194d109 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCartUS.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityFlatCartUS.java @@ -13,16 +13,7 @@ public EntityFlatCartUS(World world) { super(world); } - public EntityFlatCartUS(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + /*@Override public void onUpdate(){ diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger2.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger2.java index 77c3aa20d3..814040f943 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger2.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger2.java @@ -13,16 +13,7 @@ public EntityPassenger2(World world) { super(world); } - public EntityPassenger2(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger5.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger5.java index e29e1384fb..bacc156935 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger5.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger5.java @@ -13,16 +13,7 @@ public EntityPassenger5(World world) { super(world); } - public EntityPassenger5(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger7.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger7.java index c249cf8781..ee5c12fde1 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger7.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger7.java @@ -13,16 +13,7 @@ public EntityPassenger7(World world) { super(world); } - public EntityPassenger7(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerAdler.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerAdler.java index 1d7ea4a656..7492b3b619 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerAdler.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerAdler.java @@ -19,16 +19,7 @@ public EntityPassengerAdler(World world) { super(world); } - public EntityPassengerAdler(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerBamboo.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerBamboo.java index 83d287252d..58eed659a8 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerBamboo.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerBamboo.java @@ -13,16 +13,7 @@ public EntityPassengerBamboo(World world) { super(world); } - public EntityPassengerBamboo(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerBlue.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerBlue.java index 9d99023ce7..bea7519de2 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerBlue.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerBlue.java @@ -13,16 +13,7 @@ public EntityPassengerBlue(World world) { super(world); } - public EntityPassengerBlue(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDBOriental.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDBOriental.java index 6f1bf24b31..71d1fec84e 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDBOriental.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDBOriental.java @@ -20,16 +20,7 @@ public EntityPassengerDBOriental(World world) { super(world); } - public EntityPassengerDBOriental(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDenverRioGrande.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDenverRioGrande.java index ffa21a4b8d..e1b15f103a 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDenverRioGrande.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDenverRioGrande.java @@ -13,16 +13,7 @@ public EntityPassengerDenverRioGrande(World world) { super(world); } - public EntityPassengerDenverRioGrande(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDenverRioGrandeCombo.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDenverRioGrandeCombo.java index c26045b79e..fa27539dc0 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDenverRioGrandeCombo.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerDenverRioGrandeCombo.java @@ -13,16 +13,7 @@ public EntityPassengerDenverRioGrandeCombo(World world) { super(world); } - public EntityPassengerDenverRioGrandeCombo(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4.java index 5d09bb4abf..d9e97109d4 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4.java @@ -13,16 +13,7 @@ public EntityPassengerGS4(World world) { super(world); } - public EntityPassengerGS4(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4_Observatory.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4_Observatory.java index 1ae9998c23..6b21c98e34 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4_Observatory.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4_Observatory.java @@ -13,16 +13,7 @@ public EntityPassengerGS4_Observatory(World world) { super(world); } - public EntityPassengerGS4_Observatory(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4_Tail.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4_Tail.java index c64249250a..74d4b54ae2 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4_Tail.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerGS4_Tail.java @@ -13,16 +13,7 @@ public EntityPassengerGS4_Tail(World world) { super(world); } - public EntityPassengerGS4_Tail(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerHighSpeedCarZeroED.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerHighSpeedCarZeroED.java index 46abe32e60..38fe68aaad 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerHighSpeedCarZeroED.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerHighSpeedCarZeroED.java @@ -13,16 +13,7 @@ public EntityPassengerHighSpeedCarZeroED(World world) { super(world); } - public EntityPassengerHighSpeedCarZeroED(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public float[][] getRiderOffsets() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_1class.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_1class.java index 37489122ff..9f8f0bf9d6 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_1class.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_1class.java @@ -13,16 +13,7 @@ public EntityPassengerICE_1class(World world) { super(world); } - public EntityPassengerICE_1class(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_2class.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_2class.java index 5b8178b836..9bf3a125b1 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_2class.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_2class.java @@ -13,16 +13,7 @@ public EntityPassengerICE_2class(World world) { super(world); } - public EntityPassengerICE_2class(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_Restaurant.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_Restaurant.java index 0e766a8a9d..9ef2a461aa 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_Restaurant.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerICE_Restaurant.java @@ -13,16 +13,7 @@ public EntityPassengerICE_Restaurant(World world) { super(world); } - public EntityPassengerICE_Restaurant(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILW.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILW.java index 3c22c7c52d..5c89bbe9d9 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILW.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILW.java @@ -13,16 +13,7 @@ public EntityPassengerMILW(World world) { super(world); } - public EntityPassengerMILW(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILWDiner.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILWDiner.java index 47a7091db9..41e6e7b10a 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILWDiner.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILWDiner.java @@ -13,16 +13,7 @@ public EntityPassengerMILWDiner(World world) { super(world); } - public EntityPassengerMILWDiner(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void updateRiderPosition() { //if(this.bogie[0]!=null){ diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILWTail.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILWTail.java index 2e010b9b4d..3ceb272711 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILWTail.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerMILWTail.java @@ -13,16 +13,7 @@ public EntityPassengerMILWTail(World world) { super(world); } - public EntityPassengerMILWTail(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingold.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingold.java index c107fdd6c4..3a6f3566ef 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingold.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingold.java @@ -13,16 +13,7 @@ public EntityPassengerRheingold(World world) { super(world); } - public EntityPassengerRheingold(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldDining1.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldDining1.java index 2b3fd657d3..1534c59aaf 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldDining1.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldDining1.java @@ -21,16 +21,7 @@ public void initWorkCart() { furnaceCookTime = 0; } - public EntityPassengerRheingoldDining1(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public float[][] getRiderOffsets(){return new float[][]{{0f,-0.5f, 0f}, {3f,-0.5f, 0f}};} diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldDining2.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldDining2.java index f0ab8e55af..ccb8eebdb1 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldDining2.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldDining2.java @@ -22,16 +22,7 @@ public void initWorkCart() { furnaceCookTime = 0; } - public EntityPassengerRheingoldDining2(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldPanorama.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldPanorama.java index 3f91ad51f8..162823635e 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldPanorama.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerRheingoldPanorama.java @@ -13,16 +13,7 @@ public EntityPassengerRheingoldPanorama(World world) { super(world); } - public EntityPassengerRheingoldPanorama(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public float getPlayerScale() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerTramNY.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerTramNY.java index 7b3884823d..80730023ab 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerTramNY.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassengerTramNY.java @@ -13,16 +13,7 @@ public EntityPassengerTramNY(World world) { super(world); } - public EntityPassengerTramNY(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger_1class_DB.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger_1class_DB.java index d3c53886b2..47da8ff4a8 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger_1class_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger_1class_DB.java @@ -13,16 +13,7 @@ public EntityPassenger_1class_DB(World world) { super(world); } - public EntityPassenger_1class_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger_2class_DB.java b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger_2class_DB.java index 4687f8626d..383f459e40 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger_2class_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/EntityPassenger_2class_DB.java @@ -13,16 +13,7 @@ public EntityPassenger_2class_DB(World world) { super(world); } - public EntityPassenger_2class_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/PassengerIC4_DSB_FG.java b/src/main/java/train/common/entity/rollingStockOld/passenger/PassengerIC4_DSB_FG.java index dc995f405b..872a301e29 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/PassengerIC4_DSB_FG.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/PassengerIC4_DSB_FG.java @@ -13,16 +13,7 @@ public PassengerIC4_DSB_FG(World world) { super(world); } - public PassengerIC4_DSB_FG(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/passenger/PassengerIC4_DSB_FH.java b/src/main/java/train/common/entity/rollingStockOld/passenger/PassengerIC4_DSB_FH.java index 3355e32bd2..e39a4c47f0 100644 --- a/src/main/java/train/common/entity/rollingStockOld/passenger/PassengerIC4_DSB_FH.java +++ b/src/main/java/train/common/entity/rollingStockOld/passenger/PassengerIC4_DSB_FH.java @@ -13,16 +13,7 @@ public PassengerIC4_DSB_FH(World world) { super(world); } - public PassengerIC4_DSB_FH(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitDD35.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitDD35.java index a5e5806552..5515acc46a 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitDD35.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitDD35.java @@ -29,16 +29,7 @@ public EntityBUnitDD35(World world) { this.theTank = LiquidManager.getInstance().new FilteredTank(getTankCapacity()[0], LiquidManager.dieselFilter()); } - public EntityBUnitDD35(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitEMDF3.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitEMDF3.java index d205df92dc..09103af249 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitEMDF3.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitEMDF3.java @@ -29,16 +29,7 @@ public EntityBUnitEMDF3(World world) { this.theTank = LiquidManager.getInstance().new FilteredTank(getTankCapacity()[0], LiquidManager.dieselFilter()); } - public EntityBUnitEMDF3(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitEMDF7.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitEMDF7.java index e130a2ba4e..42aa3b41d3 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitEMDF7.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityBUnitEMDF7.java @@ -29,16 +29,7 @@ public EntityBUnitEMDF7(World world) { this.theTank = LiquidManager.getInstance().new FilteredTank(getTankCapacity()[0], LiquidManager.dieselFilter()); } - public EntityBUnitEMDF7(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityJukeBoxCart.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityJukeBoxCart.java index 0ec3e2b269..6963fafc16 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityJukeBoxCart.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityJukeBoxCart.java @@ -32,16 +32,7 @@ public EntityJukeBoxCart(World world) { side = FMLCommonHandler.instance().getEffectiveSide(); } - public EntityJukeBoxCart(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean attackEntityFrom(DamageSource damagesource, float i) { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityMailWagen_DB.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityMailWagen_DB.java index 8cb878bec7..c02a30b598 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityMailWagen_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityMailWagen_DB.java @@ -23,16 +23,7 @@ public void initMailWagenCart() { furnaceCookTime = 0; } - public EntityMailWagen_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaBritain.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaBritain.java index 57676ff9df..e46766228f 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaBritain.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaBritain.java @@ -15,16 +15,7 @@ public EntityPropagandaBritain(World world) { super(world); } - public EntityPropagandaBritain(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean attackEntityFrom(DamageSource damagesource, float i) { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaJapan.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaJapan.java index e1c611b314..c097f62818 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaJapan.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaJapan.java @@ -15,16 +15,7 @@ public EntityPropagandaJapan(World world) { super(world); } - public EntityPropagandaJapan(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean attackEntityFrom(DamageSource damagesource, float i) { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaUS.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaUS.java index 3ffaa4b79d..e9831fb0ce 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaUS.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaUS.java @@ -15,16 +15,7 @@ public EntityPropagandaUS(World world) { super(world); } - public EntityPropagandaUS(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean attackEntityFrom(DamageSource damagesource, float i) { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaUSSR.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaUSSR.java index a1d655361a..1258f99f36 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaUSSR.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityPropagandaUSSR.java @@ -15,16 +15,7 @@ public EntityPropagandaUSSR(World world) { super(world); } - public EntityPropagandaUSSR(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean attackEntityFrom(DamageSource damagesource, float i) { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityStockCar.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityStockCar.java index bb02163333..83cba51f58 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityStockCar.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityStockCar.java @@ -13,16 +13,7 @@ public EntityStockCar(World world) { super(world); } - public EntityStockCar(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityStockCarDRWG.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityStockCarDRWG.java index 873d66ca26..b7eba4963d 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityStockCarDRWG.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityStockCarDRWG.java @@ -12,16 +12,7 @@ public EntityStockCarDRWG(World world) { super(world); } - public EntityStockCarDRWG(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityTracksBuilder.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityTracksBuilder.java index df6059e3cd..7fbf74469c 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityTracksBuilder.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityTracksBuilder.java @@ -111,22 +111,7 @@ public void initBuilder() { dataWatcher.addObject(28, 0); } - public EntityTracksBuilder(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - currentHeight = posY; - plannedHeight = (int) currentHeight - 1; - setPlannedHeight(plannedHeight); - - if(world instanceof WorldServer) - fakeplayer=new FakePlayer((WorldServer) world, getOwner()!=null?getOwner():new GameProfile(UUID.nameUUIDFromBytes(trainOwner==null||trainOwner.length()<1?"[Traincraft]".getBytes(): trainOwner.getBytes()),trainOwner==null||trainOwner.length()<1?"[Traincraft]": trainOwner)); - } + @Override public int getInventoryStackLimit() { diff --git a/src/main/java/train/common/entity/rollingStockOld/special/EntityWorkCart.java b/src/main/java/train/common/entity/rollingStockOld/special/EntityWorkCart.java index 095e74afcc..a1d1b5fabd 100644 --- a/src/main/java/train/common/entity/rollingStockOld/special/EntityWorkCart.java +++ b/src/main/java/train/common/entity/rollingStockOld/special/EntityWorkCart.java @@ -20,16 +20,7 @@ public void initWorkCart() { furnaceCookTime = 0; } - public EntityWorkCart(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public float[][] getRiderOffsets() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam040VB.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam040VB.java index 5d765653a0..33a580d880 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam040VB.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam040VB.java @@ -14,16 +14,7 @@ public EntityLocoSteam040VB(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteam040VB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean shouldRiderSit(){return false;} diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam262T.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam262T.java index 5fd0b1b888..915a616130 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam262T.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam262T.java @@ -14,16 +14,7 @@ public EntityLocoSteam262T(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteam262T(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean shouldRiderSit(){return false;} diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam4_4_0.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam4_4_0.java index 2ef55d309b..370b032973 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam4_4_0.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteam4_4_0.java @@ -14,16 +14,7 @@ public EntityLocoSteam4_4_0(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteam4_4_0(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAdler.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAdler.java index efb23dc535..65db2853f9 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAdler.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAdler.java @@ -14,16 +14,7 @@ public EntityLocoSteamAdler(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamAdler(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAlcoSC4.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAlcoSC4.java index 11a7012d7d..4fba560add 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAlcoSC4.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAlcoSC4.java @@ -14,16 +14,7 @@ public EntityLocoSteamAlcoSC4(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamAlcoSC4(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAlice0_4_0.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAlice0_4_0.java index 44ee8354a8..312e60ef36 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAlice0_4_0.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamAlice0_4_0.java @@ -14,16 +14,7 @@ public EntityLocoSteamAlice0_4_0(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamAlice0_4_0(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean shouldRiderSit(){return false;} diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBR01_DB.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBR01_DB.java index a9cc8b61d0..b778a78f86 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBR01_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBR01_DB.java @@ -13,16 +13,7 @@ public class EntityLocoSteamBR01_DB extends SteamTrain { public EntityLocoSteamBR01_DB(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamBR01_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBR80_DB.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBR80_DB.java index 4c454744bc..ce28af6e3b 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBR80_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBR80_DB.java @@ -13,16 +13,7 @@ public class EntityLocoSteamBR80_DB extends SteamTrain { public EntityLocoSteamBR80_DB(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamBR80_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBerk1225.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBerk1225.java index 6976a9a0e1..5384bec395 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBerk1225.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBerk1225.java @@ -14,16 +14,7 @@ public EntityLocoSteamBerk1225(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamBerk1225(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBerk765.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBerk765.java index 60c23e3297..841e85a08c 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBerk765.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamBerk765.java @@ -14,16 +14,7 @@ public EntityLocoSteamBerk765(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamBerk765(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41.java index bacc786e7b..58172e9e58 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41.java @@ -12,16 +12,7 @@ public EntityLocoSteamC41(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamC41(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public float getPlayerScale() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41T.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41T.java index f88fb6c1e7..a9b44778fe 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41T.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41T.java @@ -14,16 +14,7 @@ public EntityLocoSteamC41T(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamC41T(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41_080.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41_080.java index b698de6f80..202eb9ff92 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41_080.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC41_080.java @@ -14,16 +14,7 @@ public EntityLocoSteamC41_080(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamC41_080(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC62Class.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC62Class.java index 41caf52dba..4898152984 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC62Class.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamC62Class.java @@ -14,16 +14,7 @@ public EntityLocoSteamC62Class(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamC62Class(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamCherepanov.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamCherepanov.java index 126950a841..d69a145276 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamCherepanov.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamCherepanov.java @@ -14,16 +14,7 @@ public EntityLocoSteamCherepanov(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamCherepanov(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamClimax.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamClimax.java index e5b2871a07..9ff6899903 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamClimax.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamClimax.java @@ -14,16 +14,7 @@ public EntityLocoSteamClimax(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamClimax(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean shouldRiderSit(){return false;} diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamCoranationClass.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamCoranationClass.java index ee6c8dd887..5087919718 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamCoranationClass.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamCoranationClass.java @@ -14,16 +14,7 @@ public EntityLocoSteamCoranationClass(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamCoranationClass(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamD51.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamD51.java index eb285d71f2..2caab96771 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamD51.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamD51.java @@ -14,16 +14,7 @@ public EntityLocoSteamD51(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamD51(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamD51Long.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamD51Long.java index 271032ee14..c86c2006e8 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamD51Long.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamD51Long.java @@ -14,16 +14,7 @@ public EntityLocoSteamD51Long(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamD51Long(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamEr_Ussr.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamEr_Ussr.java index 32ba9fc933..e69314dbd7 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamEr_Ussr.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamEr_Ussr.java @@ -14,16 +14,7 @@ public EntityLocoSteamEr_Ussr(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamEr_Ussr(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamForneyRed.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamForneyRed.java index 99d5dc1f71..6772366192 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamForneyRed.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamForneyRed.java @@ -23,16 +23,7 @@ public int getSizeInventory() { return 17; } - public EntityLocoSteamForneyRed(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamFowler.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamFowler.java index e30d5aeaae..fc671af217 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamFowler.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamFowler.java @@ -14,16 +14,7 @@ public EntityLocoSteamFowler(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamFowler(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamGLYN042T.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamGLYN042T.java index c569e9c06e..f355ebfa40 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamGLYN042T.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamGLYN042T.java @@ -14,16 +14,7 @@ public EntityLocoSteamGLYN042T(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamGLYN042T(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean shouldRiderSit(){return false;} diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamGS4.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamGS4.java index 4c20d187d1..933cc1dd18 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamGS4.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamGS4.java @@ -13,16 +13,7 @@ public class EntityLocoSteamGS4 extends SteamTrain { public EntityLocoSteamGS4(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamGS4(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamHallClass.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamHallClass.java index 0f2a591a88..f5031aa770 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamHallClass.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamHallClass.java @@ -14,16 +14,7 @@ public EntityLocoSteamHallClass(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamHallClass(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamHeavy.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamHeavy.java index 2d01332c0c..ba5704d00f 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamHeavy.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamHeavy.java @@ -14,16 +14,7 @@ public EntityLocoSteamHeavy(World world) { super(world,LiquidManager.WATER_FILTER); } - public EntityLocoSteamHeavy(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamKingClass.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamKingClass.java index 77a581193d..5c7acd2cb4 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamKingClass.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamKingClass.java @@ -14,16 +14,7 @@ public EntityLocoSteamKingClass(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamKingClass(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamLSSP7.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamLSSP7.java index 4ce0de6e7b..1bb82c52de 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamLSSP7.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamLSSP7.java @@ -14,16 +14,7 @@ public EntityLocoSteamLSSP7(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamLSSP7(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMILWClassA.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMILWClassA.java index cd976868b6..3d4c7b4149 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMILWClassA.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMILWClassA.java @@ -14,16 +14,7 @@ public EntityLocoSteamMILWClassA(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamMILWClassA(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMallardA4.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMallardA4.java index 3202d4631c..f049dddff4 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMallardA4.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMallardA4.java @@ -14,16 +14,7 @@ public EntityLocoSteamMallardA4(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamMallardA4(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMogulBlue.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMogulBlue.java index 4192f97925..df6b2999f8 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMogulBlue.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamMogulBlue.java @@ -13,16 +13,7 @@ public class EntityLocoSteamMogulBlue extends SteamTrain { public EntityLocoSteamMogulBlue(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamMogulBlue(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamPannier.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamPannier.java index 5f90abb798..ba6ecc7f72 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamPannier.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamPannier.java @@ -14,16 +14,7 @@ public EntityLocoSteamPannier(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamPannier(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean shouldRiderSit(){return false;} diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamShay.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamShay.java index 56a06ae267..a550eb606f 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamShay.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamShay.java @@ -14,16 +14,7 @@ public EntityLocoSteamShay(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamShay(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSmall.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSmall.java index 9c183485bf..a9d8ad5619 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSmall.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSmall.java @@ -14,16 +14,7 @@ public EntityLocoSteamSmall(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamSmall(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSnowPlow.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSnowPlow.java index 8fe2bfc527..4a2da8bacd 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSnowPlow.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSnowPlow.java @@ -23,16 +23,7 @@ public EntityLocoSteamSnowPlow(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamSnowPlow(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSouthern1102.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSouthern1102.java index db0a5a881a..1676564cb6 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSouthern1102.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamSouthern1102.java @@ -14,16 +14,7 @@ public EntityLocoSteamSouthern1102(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamSouthern1102(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamUSATCUK.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamUSATCUK.java index 3de9b48a2c..8d54cfa428 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamUSATCUK.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamUSATCUK.java @@ -14,16 +14,7 @@ public EntityLocoSteamUSATCUK(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamUSATCUK(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamUSATCUS.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamUSATCUS.java index ca099bd4f7..663d365ac7 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamUSATCUS.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamUSATCUS.java @@ -14,16 +14,7 @@ public EntityLocoSteamUSATCUS(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamUSATCUS(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamVBShay.java b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamVBShay.java index 9d27573bef..c6309e3a55 100644 --- a/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamVBShay.java +++ b/src/main/java/train/common/entity/rollingStockOld/steam/EntityLocoSteamVBShay.java @@ -14,16 +14,7 @@ public EntityLocoSteamVBShay(World world) { super(world, LiquidManager.WATER_FILTER); } - public EntityLocoSteamVBShay(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public boolean shouldRiderSit(){return false;} diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender4000.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender4000.java index ef6776380b..17c4cf69c4 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender4000.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender4000.java @@ -28,16 +28,7 @@ public void initFreightTender() { this.setDefaultMass(0.2); } - public EntityTender4000(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender4_4_0.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender4_4_0.java index 237a65f33e..a8661c81e8 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender4_4_0.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender4_4_0.java @@ -25,16 +25,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTender4_4_0(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderA4.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderA4.java index e2178e20d5..fbffef3fbf 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderA4.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderA4.java @@ -26,16 +26,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTenderA4(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderAdler.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderAdler.java index 69f2b0498a..c5e7d7d801 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderAdler.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderAdler.java @@ -35,17 +35,6 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTenderAdler(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } - @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderBR01_DB.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderBR01_DB.java index d495c89bdf..aa0890de66 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderBR01_DB.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderBR01_DB.java @@ -28,16 +28,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTenderBR01_DB(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderBerk1225.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderBerk1225.java index a8641bcba0..3c361d1324 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderBerk1225.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderBerk1225.java @@ -28,17 +28,6 @@ public void initFreightTender() { this.setDefaultMass(0.2); } - public EntityTenderBerk1225(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } - @Override public void setDead() { super.setDead(); diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderC62Class.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderC62Class.java index 0fab75fb57..3cf5a5990e 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderC62Class.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderC62Class.java @@ -28,16 +28,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTenderC62Class(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderCoranationClass.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderCoranationClass.java index 5ff7bb7d22..7bedb4acd2 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderCoranationClass.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderCoranationClass.java @@ -28,16 +28,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTenderCoranationClass(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderD51.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderD51.java index ff93c0fba8..880af1489d 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderD51.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderD51.java @@ -28,16 +28,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTenderD51(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderEr_Ussr.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderEr_Ussr.java index 3df283eae2..c9e7b8f2cc 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderEr_Ussr.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderEr_Ussr.java @@ -28,16 +28,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTenderEr_Ussr(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderFowler4F.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderFowler4F.java index a74c3e8878..725ac92577 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderFowler4F.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderFowler4F.java @@ -28,16 +28,7 @@ public void initFreightTender() { this.setDefaultMass(0.2); } - public EntityTenderFowler4F(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderGS4.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderGS4.java index c8ea39731e..f2bc8dbe09 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderGS4.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderGS4.java @@ -27,16 +27,7 @@ public void initFreightTender() { this.setDefaultMass(0.2); } - public EntityTenderGS4(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderHeavy.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderHeavy.java index 63f7f10f9b..f45e92a338 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderHeavy.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderHeavy.java @@ -26,16 +26,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTenderHeavy(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderMILW.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderMILW.java index e4a97b1d6c..0960159c44 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderMILW.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderMILW.java @@ -27,16 +27,7 @@ public void initFreightTender() { this.setDefaultMass(0.2); } - public EntityTenderMILW(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderSmall.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderSmall.java index 5f39f04b78..a833962fec 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderSmall.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTenderSmall.java @@ -29,16 +29,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTenderSmall(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender_C41.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender_C41.java index 558f42ca57..c5bb56f13c 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender_C41.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender_C41.java @@ -28,16 +28,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTender_C41(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender_Southern1102.java b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender_Southern1102.java index 4d23471eb6..bb770e68cc 100644 --- a/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender_Southern1102.java +++ b/src/main/java/train/common/entity/rollingStockOld/tender/EntityTender_Southern1102.java @@ -28,16 +28,7 @@ public void initFreightTender() { tenderItems = new ItemStack[freightInventorySize]; } - public EntityTender_Southern1102(World world, double d, double d1, double d2) { - this(world); - setPosition(d, d1 + (double) yOffset, d2); - motionX = 0.0D; - motionY = 0.0D; - motionZ = 0.0D; - prevPosX = d; - prevPosY = d1; - prevPosZ = d2; - } + @Override public void setDead() { diff --git a/src/main/java/train/common/entity/stock/freight/EntityBoxCartPRR.java b/src/main/java/train/common/entity/stock/freight/EntityBoxCartPRR.java index 0a939e6051..9f61988ebd 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityBoxCartPRR.java +++ b/src/main/java/train/common/entity/stock/freight/EntityBoxCartPRR.java @@ -15,9 +15,8 @@ public class EntityBoxCartPRR extends Freight { - public static final Item thisItem = new ItemRollingStock(new EntityBoxCartPRR(null), Info.modID+":+train_box_prr", Traincraft.tcTab); - public EntityBoxCartPRR(World world, double x, double y, double z) { - super(world, x, y, z); } + public static final Item thisItem = new ItemRollingStock(new EntityBoxCartPRR(null), Info.modID+":+train_box_prr", Traincraft.tcTab); + public EntityBoxCartPRR(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityBoxCartUS.java b/src/main/java/train/common/entity/stock/freight/EntityBoxCartUS.java index 893f6cc427..d3951ef95e 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityBoxCartUS.java +++ b/src/main/java/train/common/entity/stock/freight/EntityBoxCartUS.java @@ -16,8 +16,7 @@ public class EntityBoxCartUS extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityBoxCartUS(null), Info.modID+":+train_box_us", Traincraft.tcTab); - public EntityBoxCartUS(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityBoxCartUS(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityBulkheadFlatCart.java b/src/main/java/train/common/entity/stock/freight/EntityBulkheadFlatCart.java index fe7692151f..5d87b53e76 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityBulkheadFlatCart.java +++ b/src/main/java/train/common/entity/stock/freight/EntityBulkheadFlatCart.java @@ -16,8 +16,7 @@ public class EntityBulkheadFlatCart extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityBulkheadFlatCart(null), Info.modID+":+train_bulkheadflat_wood", Traincraft.tcTab); - public EntityBulkheadFlatCart(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityBulkheadFlatCart(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFlatCarLogs_DB.java b/src/main/java/train/common/entity/stock/freight/EntityFlatCarLogs_DB.java index 560d884f84..650744cd88 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFlatCarLogs_DB.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFlatCarLogs_DB.java @@ -16,8 +16,7 @@ public class EntityFlatCarLogs_DB extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFlatCarLogs_DB(null), Info.modID+":+train_transport_wood_3", Traincraft.tcTab); - public EntityFlatCarLogs_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFlatCarLogs_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFlatCarRails_DB.java b/src/main/java/train/common/entity/stock/freight/EntityFlatCarRails_DB.java index 9a95eb455f..a46e89b9a7 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFlatCarRails_DB.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFlatCarRails_DB.java @@ -16,8 +16,7 @@ public class EntityFlatCarRails_DB extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFlatCarRails_DB(null), Info.modID+":+train_transport_rail", Traincraft.tcTab); - public EntityFlatCarRails_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFlatCarRails_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFlatCartWoodUS.java b/src/main/java/train/common/entity/stock/freight/EntityFlatCartWoodUS.java index e723959068..9f046d6c0a 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFlatCartWoodUS.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFlatCartWoodUS.java @@ -16,8 +16,7 @@ public class EntityFlatCartWoodUS extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFlatCartWoodUS(null), Info.modID+":+train_flat_wood", Traincraft.tcTab); - public EntityFlatCartWoodUS(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFlatCartWoodUS(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreight100TonHopper.java b/src/main/java/train/common/entity/stock/freight/EntityFreight100TonHopper.java index 735e4581cf..6f243e857e 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreight100TonHopper.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreight100TonHopper.java @@ -16,8 +16,7 @@ public class EntityFreight100TonHopper extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreight100TonHopper(null), Info.modID+":+train_100_ton_hopper", Traincraft.tcTab); - public EntityFreight100TonHopper(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreight100TonHopper(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightASTFAutorack.java b/src/main/java/train/common/entity/stock/freight/EntityFreightASTFAutorack.java index 5d2d99cce7..a4cf772206 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightASTFAutorack.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightASTFAutorack.java @@ -16,8 +16,7 @@ public class EntityFreightASTFAutorack extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightASTFAutorack(null), Info.modID+":+train_autorack", Traincraft.tcTab); - public EntityFreightASTFAutorack(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightASTFAutorack(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightBaggageMILW.java b/src/main/java/train/common/entity/stock/freight/EntityFreightBaggageMILW.java index 9bca9cd662..d5eecd0b90 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightBaggageMILW.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightBaggageMILW.java @@ -16,8 +16,7 @@ public class EntityFreightBaggageMILW extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightBaggageMILW(null), Info.modID+":+train_baggage_milw", Traincraft.tcTab); - public EntityFreightBaggageMILW(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightBaggageMILW(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightBamboo.java b/src/main/java/train/common/entity/stock/freight/EntityFreightBamboo.java index 3398991131..d3706f54b8 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightBamboo.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightBamboo.java @@ -16,8 +16,7 @@ public class EntityFreightBamboo extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightBamboo(null), Info.modID+":+train_freight_bamboo", Traincraft.tcTab); - public EntityFreightBamboo(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightBamboo(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightCart.java b/src/main/java/train/common/entity/stock/freight/EntityFreightCart.java index 6559dddf3b..068d50459f 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightCart.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightCart.java @@ -16,8 +16,7 @@ public class EntityFreightCart extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightCart(null), Info.modID+":+train_freight_1", Traincraft.tcTab); - public EntityFreightCart(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightCart(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightCart2.java b/src/main/java/train/common/entity/stock/freight/EntityFreightCart2.java index 8b4211d9b6..4c78950c22 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightCart2.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightCart2.java @@ -16,8 +16,7 @@ public class EntityFreightCart2 extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightCart2(null), Info.modID+":+train_freight_2", Traincraft.tcTab); - public EntityFreightCart2(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightCart2(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightCartL.java b/src/main/java/train/common/entity/stock/freight/EntityFreightCartL.java index 4a7a45ac6c..d72b6431b5 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightCartL.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightCartL.java @@ -16,8 +16,7 @@ public class EntityFreightCartL extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightCartL(null), Info.modID+":+train_freight_l", Traincraft.tcTab); - public EntityFreightCartL(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightCartL(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightCartSmall.java b/src/main/java/train/common/entity/stock/freight/EntityFreightCartSmall.java index a4528809bf..5a27bad6e4 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightCartSmall.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightCartSmall.java @@ -16,8 +16,7 @@ public class EntityFreightCartSmall extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightCartSmall(null), Info.modID+":+train_freight_4", Traincraft.tcTab); - public EntityFreightCartSmall(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightCartSmall(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightCartUS.java b/src/main/java/train/common/entity/stock/freight/EntityFreightCartUS.java index e9c1e7c93b..268d86cf95 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightCartUS.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightCartUS.java @@ -16,8 +16,7 @@ public class EntityFreightCartUS extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightCartUS(null), Info.modID+":+train_freight_3", Traincraft.tcTab); - public EntityFreightCartUS(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightCartUS(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Empty.java b/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Empty.java index 8c40b206c2..7feb223e60 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Empty.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Empty.java @@ -16,8 +16,7 @@ public class EntityFreightCenterbeam_Empty extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightCenterbeam_Empty(null), Info.modID+":+train_freight_empty", Traincraft.tcTab); - public EntityFreightCenterbeam_Empty(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightCenterbeam_Empty(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Wood_1.java b/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Wood_1.java index 7a353cb11a..5bc4abe90c 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Wood_1.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Wood_1.java @@ -16,8 +16,7 @@ public class EntityFreightCenterbeam_Wood_1 extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightCenterbeam_Wood_1(null), Info.modID+":+train_freight_wood_1", Traincraft.tcTab); - public EntityFreightCenterbeam_Wood_1(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightCenterbeam_Wood_1(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Wood_2.java b/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Wood_2.java index 76c8114260..25f0868a78 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Wood_2.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightCenterbeam_Wood_2.java @@ -16,8 +16,7 @@ public class EntityFreightCenterbeam_Wood_2 extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightCenterbeam_Wood_2(null), Info.modID+":+train_freight_wood_2", Traincraft.tcTab); - public EntityFreightCenterbeam_Wood_2(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightCenterbeam_Wood_2(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightClosed.java b/src/main/java/train/common/entity/stock/freight/EntityFreightClosed.java index 01060f5e92..25aa1d74b0 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightClosed.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightClosed.java @@ -16,8 +16,7 @@ public class EntityFreightClosed extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightClosed(null), Info.modID+":+train_freight_closed", Traincraft.tcTab); - public EntityFreightClosed(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightClosed(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightDenverRioGrande.java b/src/main/java/train/common/entity/stock/freight/EntityFreightDenverRioGrande.java index aa48cdde8e..37ee7ae4ec 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightDenverRioGrande.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightDenverRioGrande.java @@ -16,8 +16,7 @@ public class EntityFreightDenverRioGrande extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightDenverRioGrande(null), Info.modID+":+denverriogrande_baggage", Traincraft.tcTab); - public EntityFreightDenverRioGrande(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightDenverRioGrande(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightDepressedFlatbed.java b/src/main/java/train/common/entity/stock/freight/EntityFreightDepressedFlatbed.java index f34d89b811..4a86be3ee1 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightDepressedFlatbed.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightDepressedFlatbed.java @@ -16,8 +16,7 @@ public class EntityFreightDepressedFlatbed extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightDepressedFlatbed(null), Info.modID+":+train_freight_depressed_flatbed", Traincraft.tcTab); - public EntityFreightDepressedFlatbed(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightDepressedFlatbed(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightGS4_Baggage.java b/src/main/java/train/common/entity/stock/freight/EntityFreightGS4_Baggage.java index 9efef73b19..687137cf19 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightGS4_Baggage.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightGS4_Baggage.java @@ -16,8 +16,7 @@ public class EntityFreightGS4_Baggage extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightGS4_Baggage(null), Info.modID+":+GS4_baggage", Traincraft.tcTab); - public EntityFreightGS4_Baggage(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightGS4_Baggage(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightGTNG.java b/src/main/java/train/common/entity/stock/freight/EntityFreightGTNG.java index 8bd327a3bc..54dcdfc1d8 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightGTNG.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightGTNG.java @@ -16,8 +16,7 @@ public class EntityFreightGTNG extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightGTNG(null), Info.modID+":+freight_gtng", Traincraft.tcTab); - public EntityFreightGTNG(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightGTNG(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightGermanPost.java b/src/main/java/train/common/entity/stock/freight/EntityFreightGermanPost.java index 2d3430818b..3941e0245d 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightGermanPost.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightGermanPost.java @@ -16,8 +16,7 @@ public class EntityFreightGermanPost extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightGermanPost(null), Info.modID+":+train_freight_german_post", Traincraft.tcTab); - public EntityFreightGermanPost(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightGermanPost(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightGondola_DB.java b/src/main/java/train/common/entity/stock/freight/EntityFreightGondola_DB.java index f437efdb9f..5358ccf561 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightGondola_DB.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightGondola_DB.java @@ -16,8 +16,7 @@ public class EntityFreightGondola_DB extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightGondola_DB(null), Info.modID+":+train_freight_gondola", Traincraft.tcTab); - public EntityFreightGondola_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightGondola_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightGrain.java b/src/main/java/train/common/entity/stock/freight/EntityFreightGrain.java index fd0dd899d5..0371de78d5 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightGrain.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightGrain.java @@ -16,8 +16,7 @@ public class EntityFreightGrain extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightGrain(null), Info.modID+":+train_hopper_grain", Traincraft.tcTab); - public EntityFreightGrain(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightGrain(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightHeavyweight.java b/src/main/java/train/common/entity/stock/freight/EntityFreightHeavyweight.java index d957d4e39b..0e2640c3fb 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightHeavyweight.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightHeavyweight.java @@ -16,8 +16,7 @@ public class EntityFreightHeavyweight extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightHeavyweight(null), Info.modID+":+heavyweight_mailcar", Traincraft.tcTab); - public EntityFreightHeavyweight(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightHeavyweight(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightHeavyweightBaggage.java b/src/main/java/train/common/entity/stock/freight/EntityFreightHeavyweightBaggage.java index 00f177fc68..8aeea1ee30 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightHeavyweightBaggage.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightHeavyweightBaggage.java @@ -16,8 +16,7 @@ public class EntityFreightHeavyweightBaggage extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightHeavyweightBaggage(null), Info.modID+":+train_heavyweight_freight", Traincraft.tcTab); - public EntityFreightHeavyweightBaggage(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightHeavyweightBaggage(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightHopperUS.java b/src/main/java/train/common/entity/stock/freight/EntityFreightHopperUS.java index c57ff63c4d..9e75beeb6e 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightHopperUS.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightHopperUS.java @@ -16,8 +16,7 @@ public class EntityFreightHopperUS extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightHopperUS(null), Info.modID+":+train_hopper_us", Traincraft.tcTab); - public EntityFreightHopperUS(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightHopperUS(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightIceWagon.java b/src/main/java/train/common/entity/stock/freight/EntityFreightIceWagon.java index a343494300..acb129c165 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightIceWagon.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightIceWagon.java @@ -16,8 +16,7 @@ public class EntityFreightIceWagon extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightIceWagon(null), Info.modID+":+icewagon", Traincraft.tcTab); - public EntityFreightIceWagon(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightIceWagon(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightKClassRailBox.java b/src/main/java/train/common/entity/stock/freight/EntityFreightKClassRailBox.java index 09060ff8e0..e41fdc5de1 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightKClassRailBox.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightKClassRailBox.java @@ -16,8 +16,7 @@ public class EntityFreightKClassRailBox extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightKClassRailBox(null), Info.modID+":+train_k_class_railbox", Traincraft.tcTab); - public EntityFreightKClassRailBox(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightKClassRailBox(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightLongCoveredHopper.java b/src/main/java/train/common/entity/stock/freight/EntityFreightLongCoveredHopper.java index 0bca5b2a6e..292fffe7c8 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightLongCoveredHopper.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightLongCoveredHopper.java @@ -16,8 +16,7 @@ public class EntityFreightLongCoveredHopper extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightLongCoveredHopper(null), Info.modID+":+train_longcoveredhopper", Traincraft.tcTab); - public EntityFreightLongCoveredHopper(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightLongCoveredHopper(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightMinetrain.java b/src/main/java/train/common/entity/stock/freight/EntityFreightMinetrain.java index c6e3764e88..58a91c4c5d 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightMinetrain.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightMinetrain.java @@ -16,8 +16,7 @@ public class EntityFreightMinetrain extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightMinetrain(null), Info.modID+":+train_mine_cart", Traincraft.tcTab); - public EntityFreightMinetrain(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightMinetrain(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightOpen2.java b/src/main/java/train/common/entity/stock/freight/EntityFreightOpen2.java index 7d54fdd6ef..8103104847 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightOpen2.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightOpen2.java @@ -16,8 +16,7 @@ public class EntityFreightOpen2 extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightOpen2(null), Info.modID+":+train_freight_open", Traincraft.tcTab); - public EntityFreightOpen2(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightOpen2(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightOpenWagon.java b/src/main/java/train/common/entity/stock/freight/EntityFreightOpenWagon.java index 2084270383..b04955b654 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightOpenWagon.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightOpenWagon.java @@ -16,8 +16,7 @@ public class EntityFreightOpenWagon extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightOpenWagon(null), Info.modID+":+train_hopper", Traincraft.tcTab); - public EntityFreightOpenWagon(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightOpenWagon(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightShortCoveredHopper.java b/src/main/java/train/common/entity/stock/freight/EntityFreightShortCoveredHopper.java index 52baded56e..e4ad3b8ffe 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightShortCoveredHopper.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightShortCoveredHopper.java @@ -16,8 +16,7 @@ public class EntityFreightShortCoveredHopper extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightShortCoveredHopper(null), Info.modID+":+train_shortcoveredhopper", Traincraft.tcTab); - public EntityFreightShortCoveredHopper(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightShortCoveredHopper(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightSlateWagon.java b/src/main/java/train/common/entity/stock/freight/EntityFreightSlateWagon.java index 166bec6661..3a6e44103e 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightSlateWagon.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightSlateWagon.java @@ -16,8 +16,7 @@ public class EntityFreightSlateWagon extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightSlateWagon(null), Info.modID+":+slatewagon", Traincraft.tcTab); - public EntityFreightSlateWagon(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightSlateWagon(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightTrailer.java b/src/main/java/train/common/entity/stock/freight/EntityFreightTrailer.java index 9be3a88d0c..3be664d7f4 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightTrailer.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightTrailer.java @@ -16,8 +16,7 @@ public class EntityFreightTrailer extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightTrailer(null), Info.modID+":+train_freight_trailer", Traincraft.tcTab); - public EntityFreightTrailer(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightTrailer(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightWagenDB.java b/src/main/java/train/common/entity/stock/freight/EntityFreightWagenDB.java index c552e57b14..5053dce076 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightWagenDB.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightWagenDB.java @@ -16,8 +16,7 @@ public class EntityFreightWagenDB extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightWagenDB(null), Info.modID+":+train_freight_db", Traincraft.tcTab); - public EntityFreightWagenDB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightWagenDB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightWellcar.java b/src/main/java/train/common/entity/stock/freight/EntityFreightWellcar.java index 82dda4d97b..2a368f90f6 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightWellcar.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightWellcar.java @@ -16,8 +16,7 @@ public class EntityFreightWellcar extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightWellcar(null), Info.modID+":+train_freight_wellcar", Traincraft.tcTab); - public EntityFreightWellcar(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightWellcar(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightWood.java b/src/main/java/train/common/entity/stock/freight/EntityFreightWood.java index 2bee215cdd..562cf710d1 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightWood.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightWood.java @@ -16,8 +16,7 @@ public class EntityFreightWood extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightWood(null), Info.modID+":+train_transport_wood", Traincraft.tcTab); - public EntityFreightWood(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightWood(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/freight/EntityFreightWood2.java b/src/main/java/train/common/entity/stock/freight/EntityFreightWood2.java index beca1b25f2..8c7b97b233 100644 --- a/src/main/java/train/common/entity/stock/freight/EntityFreightWood2.java +++ b/src/main/java/train/common/entity/stock/freight/EntityFreightWood2.java @@ -16,8 +16,7 @@ public class EntityFreightWood2 extends Freight { public static final Item thisItem = new ItemRollingStock(new EntityFreightWood2(null), Info.modID+":+train_transport_wood_2", Traincraft.tcTab); - public EntityFreightWood2(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFreightWood2(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityCaboose.java b/src/main/java/train/common/entity/stock/passenger/EntityCaboose.java index f3fe50bd03..c072d5f093 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityCaboose.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityCaboose.java @@ -16,8 +16,7 @@ public class EntityCaboose extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityCaboose(null), Info.modID+":+train_caboose", Traincraft.tcTab); - public EntityCaboose(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityCaboose(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityCaboose3.java b/src/main/java/train/common/entity/stock/passenger/EntityCaboose3.java index df237d3590..cdea7c4e9f 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityCaboose3.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityCaboose3.java @@ -16,8 +16,7 @@ public class EntityCaboose3 extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityCaboose3(null), Info.modID+":+train_caboose_2", Traincraft.tcTab); - public EntityCaboose3(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityCaboose3(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityFlatCar_DB.java b/src/main/java/train/common/entity/stock/passenger/EntityFlatCar_DB.java index 6c935e59f5..ef0d3c3611 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityFlatCar_DB.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityFlatCar_DB.java @@ -16,8 +16,7 @@ public class EntityFlatCar_DB extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityFlatCar_DB(null), Info.modID+":+train_flat_db", Traincraft.tcTab); - public EntityFlatCar_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFlatCar_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityFlatCart.java b/src/main/java/train/common/entity/stock/passenger/EntityFlatCart.java index 52730304d3..aecc5f96f6 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityFlatCart.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityFlatCart.java @@ -16,8 +16,7 @@ public class EntityFlatCart extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityFlatCart(null), Info.modID+":+train_flat", Traincraft.tcTab); - public EntityFlatCart(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFlatCart(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityFlatCartSU.java b/src/main/java/train/common/entity/stock/passenger/EntityFlatCartSU.java index eb209468a0..75380f5c9f 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityFlatCartSU.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityFlatCartSU.java @@ -16,8 +16,7 @@ public class EntityFlatCartSU extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityFlatCartSU(null), Info.modID+":+train_flat_su", Traincraft.tcTab); - public EntityFlatCartSU(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFlatCartSU(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityFlatCartUS.java b/src/main/java/train/common/entity/stock/passenger/EntityFlatCartUS.java index 16163c050b..e001ab6da4 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityFlatCartUS.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityFlatCartUS.java @@ -16,8 +16,7 @@ public class EntityFlatCartUS extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityFlatCartUS(null), Info.modID+":+train_flat_us", Traincraft.tcTab); - public EntityFlatCartUS(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityFlatCartUS(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassenger2.java b/src/main/java/train/common/entity/stock/passenger/EntityPassenger2.java index 33b30de42c..e00103834d 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassenger2.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassenger2.java @@ -16,8 +16,7 @@ public class EntityPassenger2 extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassenger2(null), Info.modID+":+train_passenger_1", Traincraft.tcTab); - public EntityPassenger2(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassenger2(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassenger5.java b/src/main/java/train/common/entity/stock/passenger/EntityPassenger5.java index c94846751b..5b89275c18 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassenger5.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassenger5.java @@ -16,8 +16,7 @@ public class EntityPassenger5 extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassenger5(null), Info.modID+":+train_passenger_2", Traincraft.tcTab); - public EntityPassenger5(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassenger5(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassenger7.java b/src/main/java/train/common/entity/stock/passenger/EntityPassenger7.java index d5850959cb..52fd9cc25a 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassenger7.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassenger7.java @@ -16,8 +16,7 @@ public class EntityPassenger7 extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassenger7(null), Info.modID+":+train_passenger_4", Traincraft.tcTab); - public EntityPassenger7(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassenger7(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerAdler.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerAdler.java index 93057cf46e..6760cebac8 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerAdler.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerAdler.java @@ -16,8 +16,7 @@ public class EntityPassengerAdler extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerAdler(null), Info.modID+":+train_passenger_adler", Traincraft.tcTab); - public EntityPassengerAdler(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerAdler(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerBamboo.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerBamboo.java index 6b63b0e37d..8bf9757197 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerBamboo.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerBamboo.java @@ -16,8 +16,7 @@ public class EntityPassengerBamboo extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerBamboo(null), Info.modID+":+train_passenger_bamboo", Traincraft.tcTab); - public EntityPassengerBamboo(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerBamboo(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerDBOriental.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerDBOriental.java index 9d1c25fdd7..733f86bd37 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerDBOriental.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerDBOriental.java @@ -16,8 +16,7 @@ public class EntityPassengerDBOriental extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerDBOriental(null), Info.modID+":+train_passenger_orient", Traincraft.tcTab); - public EntityPassengerDBOriental(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerDBOriental(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerDenverRioGrande.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerDenverRioGrande.java index efc5925ecb..7aeec6f517 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerDenverRioGrande.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerDenverRioGrande.java @@ -16,8 +16,7 @@ public class EntityPassengerDenverRioGrande extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerDenverRioGrande(null), Info.modID+":+denverriogrande_passenger", Traincraft.tcTab); - public EntityPassengerDenverRioGrande(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerDenverRioGrande(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerDenverRioGrandeCombo.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerDenverRioGrandeCombo.java index a3bbeb0aea..7f666a2a89 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerDenverRioGrandeCombo.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerDenverRioGrandeCombo.java @@ -16,8 +16,7 @@ public class EntityPassengerDenverRioGrandeCombo extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerDenverRioGrandeCombo(null), Info.modID+":+denverriogrande_combo", Traincraft.tcTab); - public EntityPassengerDenverRioGrandeCombo(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerDenverRioGrandeCombo(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4.java index 0de1ad78ed..d0ba618379 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4.java @@ -16,8 +16,7 @@ public class EntityPassengerGS4 extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerGS4(null), Info.modID+":+GS4_passenger", Traincraft.tcTab); - public EntityPassengerGS4(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerGS4(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4_Observatory.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4_Observatory.java index d400991017..773a66c7e4 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4_Observatory.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4_Observatory.java @@ -16,8 +16,7 @@ public class EntityPassengerGS4_Observatory extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerGS4_Observatory(null), Info.modID+":+GS4_observatory", Traincraft.tcTab); - public EntityPassengerGS4_Observatory(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerGS4_Observatory(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4_Tail.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4_Tail.java index 6c9398cf7f..464f1d0cb3 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4_Tail.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerGS4_Tail.java @@ -16,8 +16,7 @@ public class EntityPassengerGS4_Tail extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerGS4_Tail(null), Info.modID+":+GS4_tail", Traincraft.tcTab); - public EntityPassengerGS4_Tail(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerGS4_Tail(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerHighSpeedCarZeroED.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerHighSpeedCarZeroED.java index f3920d208e..69aaef5c07 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerHighSpeedCarZeroED.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerHighSpeedCarZeroED.java @@ -16,8 +16,7 @@ public class EntityPassengerHighSpeedCarZeroED extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerHighSpeedCarZeroED(null), Info.modID+":+train_high_speed_cart_zeroed", Traincraft.tcTab); - public EntityPassengerHighSpeedCarZeroED(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerHighSpeedCarZeroED(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_1class.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_1class.java index 894303753f..ef3541ae1a 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_1class.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_1class.java @@ -16,8 +16,7 @@ public class EntityPassengerICE_1class extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerICE_1class(null), Info.modID+":+train_ice1_passenger", Traincraft.tcTab); - public EntityPassengerICE_1class(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerICE_1class(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_2class.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_2class.java index 3ba5a6b673..3d2e0ede11 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_2class.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_2class.java @@ -16,8 +16,7 @@ public class EntityPassengerICE_2class extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerICE_2class(null), Info.modID+":+train_ice1_passenger", Traincraft.tcTab); - public EntityPassengerICE_2class(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerICE_2class(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_Restaurant.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_Restaurant.java index 783df3b282..915e07b7fb 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_Restaurant.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerICE_Restaurant.java @@ -16,8 +16,7 @@ public class EntityPassengerICE_Restaurant extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerICE_Restaurant(null), Info.modID+":+train_ice1_restaurant", Traincraft.tcTab); - public EntityPassengerICE_Restaurant(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerICE_Restaurant(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerMILW.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerMILW.java index 54a7870415..718d7a9332 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerMILW.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerMILW.java @@ -16,8 +16,7 @@ public class EntityPassengerMILW extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerMILW(null), Info.modID+":+train_passenger_milw", Traincraft.tcTab); - public EntityPassengerMILW(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerMILW(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerMILWTail.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerMILWTail.java index 1d6de41a61..a8d4bda71c 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerMILWTail.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerMILWTail.java @@ -16,8 +16,7 @@ public class EntityPassengerMILWTail extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerMILWTail(null), Info.modID+":+train_passenger_milw_tail", Traincraft.tcTab); - public EntityPassengerMILWTail(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerMILWTail(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerRheingold.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerRheingold.java index 2a479c705e..2322f13508 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerRheingold.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerRheingold.java @@ -16,8 +16,7 @@ public class EntityPassengerRheingold extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerRheingold(null), Info.modID+":+train_passenger_rheingold", Traincraft.tcTab); - public EntityPassengerRheingold(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerRheingold(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerRheingoldPanorama.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerRheingoldPanorama.java index 013907e11e..65b3f4bbf5 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerRheingoldPanorama.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerRheingoldPanorama.java @@ -16,8 +16,7 @@ public class EntityPassengerRheingoldPanorama extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerRheingoldPanorama(null), Info.modID+":+train_passenger_rheingoldpanorama", Traincraft.tcTab); - public EntityPassengerRheingoldPanorama(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerRheingoldPanorama(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassengerTramNY.java b/src/main/java/train/common/entity/stock/passenger/EntityPassengerTramNY.java index ff0f00b29d..0dcc6ff4b5 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassengerTramNY.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassengerTramNY.java @@ -16,8 +16,7 @@ public class EntityPassengerTramNY extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassengerTramNY(null), Info.modID+":+train_tram_ny", Traincraft.tcTab); - public EntityPassengerTramNY(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerTramNY(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassenger_1class_DB.java b/src/main/java/train/common/entity/stock/passenger/EntityPassenger_1class_DB.java index 474a9a73e8..4cdf953089 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassenger_1class_DB.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassenger_1class_DB.java @@ -16,8 +16,7 @@ public class EntityPassenger_1class_DB extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassenger_1class_DB(null), Info.modID+":+train_passenger_5", Traincraft.tcTab); - public EntityPassenger_1class_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassenger_1class_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityPassenger_2class_DB.java b/src/main/java/train/common/entity/stock/passenger/EntityPassenger_2class_DB.java index 4fee4b6ada..6c24fb780e 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityPassenger_2class_DB.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityPassenger_2class_DB.java @@ -16,8 +16,7 @@ public class EntityPassenger_2class_DB extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityPassenger_2class_DB(null), Info.modID+":+train_passenger_6", Traincraft.tcTab); - public EntityPassenger_2class_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassenger_2class_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityStockCar.java b/src/main/java/train/common/entity/stock/passenger/EntityStockCar.java index e5b6e73319..97b8e5f01b 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityStockCar.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityStockCar.java @@ -16,8 +16,7 @@ public class EntityStockCar extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityStockCar(null), Info.modID+":+train_stock", Traincraft.tcTab); - public EntityStockCar(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityStockCar(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/EntityStockCarDRWG.java b/src/main/java/train/common/entity/stock/passenger/EntityStockCarDRWG.java index 0898231cf0..89635b8e12 100644 --- a/src/main/java/train/common/entity/stock/passenger/EntityStockCarDRWG.java +++ b/src/main/java/train/common/entity/stock/passenger/EntityStockCarDRWG.java @@ -16,8 +16,7 @@ public class EntityStockCarDRWG extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new EntityStockCarDRWG(null), Info.modID+":+drwg_stockcar", Traincraft.tcTab); - public EntityStockCarDRWG(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityStockCarDRWG(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/PassengerIC4_DSB_FG.java b/src/main/java/train/common/entity/stock/passenger/PassengerIC4_DSB_FG.java index bf7a6827f5..cd9287712b 100644 --- a/src/main/java/train/common/entity/stock/passenger/PassengerIC4_DSB_FG.java +++ b/src/main/java/train/common/entity/stock/passenger/PassengerIC4_DSB_FG.java @@ -16,8 +16,7 @@ public class PassengerIC4_DSB_FG extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new PassengerIC4_DSB_FG(null), Info.modID+":+train_ic4_dsb_fg", Traincraft.tcTab); - public PassengerIC4_DSB_FG(World world, double x, double y, double z) { - super(world, x, y, z); } + public PassengerIC4_DSB_FG(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/passenger/PassengerIC4_DSB_FH.java b/src/main/java/train/common/entity/stock/passenger/PassengerIC4_DSB_FH.java index 07b46136a8..d8bd4a2294 100644 --- a/src/main/java/train/common/entity/stock/passenger/PassengerIC4_DSB_FH.java +++ b/src/main/java/train/common/entity/stock/passenger/PassengerIC4_DSB_FH.java @@ -16,8 +16,7 @@ public class PassengerIC4_DSB_FH extends EntityRollingStock implements IPassenger { public static final Item thisItem = new ItemRollingStock(new PassengerIC4_DSB_FH(null), Info.modID+":+train_ic4_dsb_fh", Traincraft.tcTab); - public PassengerIC4_DSB_FH(World world, double x, double y, double z) { - super(world, x, y, z); } + public PassengerIC4_DSB_FH(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/special/EntityJukeBoxCart.java b/src/main/java/train/common/entity/stock/special/EntityJukeBoxCart.java index af322334f9..af301f0072 100644 --- a/src/main/java/train/common/entity/stock/special/EntityJukeBoxCart.java +++ b/src/main/java/train/common/entity/stock/special/EntityJukeBoxCart.java @@ -16,8 +16,7 @@ public class EntityJukeBoxCart extends EntityRollingStock { public static final Item thisItem = new ItemRollingStock(new EntityJukeBoxCart(null), Info.modID+":+train_jukebox", Traincraft.tcTab); - public EntityJukeBoxCart(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityJukeBoxCart(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/special/EntityPropagandaBritain.java b/src/main/java/train/common/entity/stock/special/EntityPropagandaBritain.java index 2f0efffe51..0c4fafe662 100644 --- a/src/main/java/train/common/entity/stock/special/EntityPropagandaBritain.java +++ b/src/main/java/train/common/entity/stock/special/EntityPropagandaBritain.java @@ -16,8 +16,7 @@ public class EntityPropagandaBritain extends EntityRollingStock { public static final Item thisItem = new ItemRollingStock(new EntityPropagandaBritain(null), Info.modID+":+propaganda_british", Traincraft.tcTab); - public EntityPropagandaBritain(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPropagandaBritain(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/special/EntityPropagandaJapan.java b/src/main/java/train/common/entity/stock/special/EntityPropagandaJapan.java index 339269027f..d9b89c3a82 100644 --- a/src/main/java/train/common/entity/stock/special/EntityPropagandaJapan.java +++ b/src/main/java/train/common/entity/stock/special/EntityPropagandaJapan.java @@ -16,8 +16,7 @@ public class EntityPropagandaJapan extends EntityRollingStock { public static final Item thisItem = new ItemRollingStock(new EntityPropagandaJapan(null), Info.modID+":+propaganda_japan", Traincraft.tcTab); - public EntityPropagandaJapan(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPropagandaJapan(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/special/EntityPropagandaUS.java b/src/main/java/train/common/entity/stock/special/EntityPropagandaUS.java index 8c5406c63e..80c6a0b751 100644 --- a/src/main/java/train/common/entity/stock/special/EntityPropagandaUS.java +++ b/src/main/java/train/common/entity/stock/special/EntityPropagandaUS.java @@ -16,8 +16,7 @@ public class EntityPropagandaUS extends EntityRollingStock { public static final Item thisItem = new ItemRollingStock(new EntityPropagandaUS(null), Info.modID+":+propaganda_us", Traincraft.tcTab); - public EntityPropagandaUS(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPropagandaUS(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/special/EntityPropagandaUSSR.java b/src/main/java/train/common/entity/stock/special/EntityPropagandaUSSR.java index e64d78c919..0970a94a50 100644 --- a/src/main/java/train/common/entity/stock/special/EntityPropagandaUSSR.java +++ b/src/main/java/train/common/entity/stock/special/EntityPropagandaUSSR.java @@ -16,8 +16,7 @@ public class EntityPropagandaUSSR extends EntityRollingStock { public static final Item thisItem = new ItemRollingStock(new EntityPropagandaUSSR(null), Info.modID+":+propaganda_ussr", Traincraft.tcTab); - public EntityPropagandaUSSR(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPropagandaUSSR(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/special/EntityTracksBuilder.java b/src/main/java/train/common/entity/stock/special/EntityTracksBuilder.java index 1c0ef123ee..d9c2983818 100644 --- a/src/main/java/train/common/entity/stock/special/EntityTracksBuilder.java +++ b/src/main/java/train/common/entity/stock/special/EntityTracksBuilder.java @@ -16,8 +16,7 @@ public class EntityTracksBuilder extends EntityRollingStock { public static final Item thisItem = new ItemRollingStock(new EntityTracksBuilder(null), Info.modID+":+train_builder", Traincraft.tcTab); - public EntityTracksBuilder(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTracksBuilder(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tanker/EntityBUnitDD35.java b/src/main/java/train/common/entity/stock/tanker/EntityBUnitDD35.java index 58c7c4dc88..bc7e4dd9f1 100644 --- a/src/main/java/train/common/entity/stock/tanker/EntityBUnitDD35.java +++ b/src/main/java/train/common/entity/stock/tanker/EntityBUnitDD35.java @@ -16,8 +16,7 @@ public class EntityBUnitDD35 extends LiquidTank { public static final Item thisItem = new ItemRollingStock(new EntityBUnitDD35(null), Info.modID+":+train_dd35b", Traincraft.tcTab); - public EntityBUnitDD35(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityBUnitDD35(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tanker/EntityBUnitEMDF3.java b/src/main/java/train/common/entity/stock/tanker/EntityBUnitEMDF3.java index d4d08c6519..0081e90bcc 100644 --- a/src/main/java/train/common/entity/stock/tanker/EntityBUnitEMDF3.java +++ b/src/main/java/train/common/entity/stock/tanker/EntityBUnitEMDF3.java @@ -16,8 +16,7 @@ public class EntityBUnitEMDF3 extends LiquidTank { public static final Item thisItem = new ItemRollingStock(new EntityBUnitEMDF3(null), Info.modID+":+train_emdf3b", Traincraft.tcTab); - public EntityBUnitEMDF3(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityBUnitEMDF3(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tanker/EntityBUnitEMDF7.java b/src/main/java/train/common/entity/stock/tanker/EntityBUnitEMDF7.java index 100183b2de..36cfaf5312 100644 --- a/src/main/java/train/common/entity/stock/tanker/EntityBUnitEMDF7.java +++ b/src/main/java/train/common/entity/stock/tanker/EntityBUnitEMDF7.java @@ -16,8 +16,7 @@ public class EntityBUnitEMDF7 extends LiquidTank { public static final Item thisItem = new ItemRollingStock(new EntityBUnitEMDF7(null), Info.modID+":+train_emdf7b", Traincraft.tcTab); - public EntityBUnitEMDF7(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityBUnitEMDF7(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tanker/EntityTankLava.java b/src/main/java/train/common/entity/stock/tanker/EntityTankLava.java index bbcd4a87f0..5b69be9bf1 100644 --- a/src/main/java/train/common/entity/stock/tanker/EntityTankLava.java +++ b/src/main/java/train/common/entity/stock/tanker/EntityTankLava.java @@ -16,8 +16,7 @@ public class EntityTankLava extends LiquidTank { public static final Item thisItem = new ItemRollingStock(new EntityTankLava(null), Info.modID+":+train_tank_lava", Traincraft.tcTab); - public EntityTankLava(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTankLava(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tanker/EntityTankWagon.java b/src/main/java/train/common/entity/stock/tanker/EntityTankWagon.java index 262d0c2943..e09caa6e71 100644 --- a/src/main/java/train/common/entity/stock/tanker/EntityTankWagon.java +++ b/src/main/java/train/common/entity/stock/tanker/EntityTankWagon.java @@ -16,8 +16,7 @@ public class EntityTankWagon extends LiquidTank { public static final Item thisItem = new ItemRollingStock(new EntityTankWagon(null), Info.modID+":+train_tank_us", Traincraft.tcTab); - public EntityTankWagon(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTankWagon(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tanker/EntityTankWagon2.java b/src/main/java/train/common/entity/stock/tanker/EntityTankWagon2.java index 36dd1bf30c..3599d127b5 100644 --- a/src/main/java/train/common/entity/stock/tanker/EntityTankWagon2.java +++ b/src/main/java/train/common/entity/stock/tanker/EntityTankWagon2.java @@ -16,8 +16,7 @@ public class EntityTankWagon2 extends LiquidTank { public static final Item thisItem = new ItemRollingStock(new EntityTankWagon2(null), Info.modID+":+train_tank_blue", Traincraft.tcTab); - public EntityTankWagon2(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTankWagon2(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tanker/EntityTankWagonThreeDome.java b/src/main/java/train/common/entity/stock/tanker/EntityTankWagonThreeDome.java index 6b90cf5611..eaedad2ceb 100644 --- a/src/main/java/train/common/entity/stock/tanker/EntityTankWagonThreeDome.java +++ b/src/main/java/train/common/entity/stock/tanker/EntityTankWagonThreeDome.java @@ -16,8 +16,7 @@ public class EntityTankWagonThreeDome extends LiquidTank { public static final Item thisItem = new ItemRollingStock(new EntityTankWagonThreeDome(null), Info.modID+":+train_tank_three_dome", Traincraft.tcTab); - public EntityTankWagonThreeDome(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTankWagonThreeDome(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tanker/EntityTankWagonUS.java b/src/main/java/train/common/entity/stock/tanker/EntityTankWagonUS.java index 1607616c71..24944f0354 100644 --- a/src/main/java/train/common/entity/stock/tanker/EntityTankWagonUS.java +++ b/src/main/java/train/common/entity/stock/tanker/EntityTankWagonUS.java @@ -16,8 +16,7 @@ public class EntityTankWagonUS extends LiquidTank { public static final Item thisItem = new ItemRollingStock(new EntityTankWagonUS(null), Info.modID+":+train_tank_us_2", Traincraft.tcTab); - public EntityTankWagonUS(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTankWagonUS(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tanker/EntityTankWagon_DB.java b/src/main/java/train/common/entity/stock/tanker/EntityTankWagon_DB.java index 0ea3e56c8a..5048739bf9 100644 --- a/src/main/java/train/common/entity/stock/tanker/EntityTankWagon_DB.java +++ b/src/main/java/train/common/entity/stock/tanker/EntityTankWagon_DB.java @@ -16,8 +16,7 @@ public class EntityTankWagon_DB extends LiquidTank { public static final Item thisItem = new ItemRollingStock(new EntityTankWagon_DB(null), Info.modID+":+train_tank_db", Traincraft.tcTab); - public EntityTankWagon_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTankWagon_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTender4000.java b/src/main/java/train/common/entity/stock/tender/EntityTender4000.java index 7a85359994..1e864d90db 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTender4000.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTender4000.java @@ -16,8 +16,7 @@ public class EntityTender4000 extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTender4000(null), Info.modID+":+4000GallonTender", Traincraft.tcTab); - public EntityTender4000(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTender4000(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTender4_4_0.java b/src/main/java/train/common/entity/stock/tender/EntityTender4_4_0.java index ce143e1904..eb994103fc 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTender4_4_0.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTender4_4_0.java @@ -16,8 +16,7 @@ public class EntityTender4_4_0 extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTender4_4_0(null), Info.modID+":+train_tender_steam", Traincraft.tcTab); - public EntityTender4_4_0(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTender4_4_0(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderA4.java b/src/main/java/train/common/entity/stock/tender/EntityTenderA4.java index c7565e8baa..f0d44cd1e3 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderA4.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderA4.java @@ -16,8 +16,7 @@ public class EntityTenderA4 extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderA4(null), Info.modID+":+train_loco_a4_mallard_tender", Traincraft.tcTab); - public EntityTenderA4(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderA4(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderAdler.java b/src/main/java/train/common/entity/stock/tender/EntityTenderAdler.java index 44971a228e..fffc08dad4 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderAdler.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderAdler.java @@ -16,8 +16,7 @@ public class EntityTenderAdler extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderAdler(null), Info.modID+":+train_tender_adler", Traincraft.tcTab); - public EntityTenderAdler(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderAdler(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderBR01_DB.java b/src/main/java/train/common/entity/stock/tender/EntityTenderBR01_DB.java index c44edd075b..3cf2fd8028 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderBR01_DB.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderBR01_DB.java @@ -16,8 +16,7 @@ public class EntityTenderBR01_DB extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderBR01_DB(null), Info.modID+":+train_tender_br01", Traincraft.tcTab); - public EntityTenderBR01_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderBR01_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderBerk1225.java b/src/main/java/train/common/entity/stock/tender/EntityTenderBerk1225.java index 161bdf5a3a..0b3151544d 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderBerk1225.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderBerk1225.java @@ -16,8 +16,7 @@ public class EntityTenderBerk1225 extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderBerk1225(null), Info.modID+":+BerkshireTender", Traincraft.tcTab); - public EntityTenderBerk1225(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderBerk1225(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderC62Class.java b/src/main/java/train/common/entity/stock/tender/EntityTenderC62Class.java index d7ed199047..aefbc2e5f7 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderC62Class.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderC62Class.java @@ -16,8 +16,7 @@ public class EntityTenderC62Class extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderC62Class(null), Info.modID+":+train_tender_c62_class", Traincraft.tcTab); - public EntityTenderC62Class(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderC62Class(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderCoranationClass.java b/src/main/java/train/common/entity/stock/tender/EntityTenderCoranationClass.java index 2549f67f4a..fce126b15b 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderCoranationClass.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderCoranationClass.java @@ -16,8 +16,7 @@ public class EntityTenderCoranationClass extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderCoranationClass(null), Info.modID+":+train_coronationclasstender", Traincraft.tcTab); - public EntityTenderCoranationClass(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderCoranationClass(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderD51.java b/src/main/java/train/common/entity/stock/tender/EntityTenderD51.java index 99f6997fa7..e94233b27c 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderD51.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderD51.java @@ -16,8 +16,7 @@ public class EntityTenderD51 extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderD51(null), Info.modID+":+train_tender_d51", Traincraft.tcTab); - public EntityTenderD51(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderD51(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderEr_Ussr.java b/src/main/java/train/common/entity/stock/tender/EntityTenderEr_Ussr.java index 329ff3d014..08db77a6b4 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderEr_Ussr.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderEr_Ussr.java @@ -16,8 +16,7 @@ public class EntityTenderEr_Ussr extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderEr_Ussr(null), Info.modID+":+train_tender_ussr", Traincraft.tcTab); - public EntityTenderEr_Ussr(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderEr_Ussr(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderFowler4F.java b/src/main/java/train/common/entity/stock/tender/EntityTenderFowler4F.java index 624e0951b8..27b97aac52 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderFowler4F.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderFowler4F.java @@ -16,8 +16,7 @@ public class EntityTenderFowler4F extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderFowler4F(null), Info.modID+":+Fowler 4F Tender", Traincraft.tcTab); - public EntityTenderFowler4F(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderFowler4F(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderGS4.java b/src/main/java/train/common/entity/stock/tender/EntityTenderGS4.java index b016977113..f5212cf6df 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderGS4.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderGS4.java @@ -16,8 +16,7 @@ public class EntityTenderGS4 extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderGS4(null), Info.modID+":+GS4_tender", Traincraft.tcTab); - public EntityTenderGS4(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderGS4(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderHeavy.java b/src/main/java/train/common/entity/stock/tender/EntityTenderHeavy.java index ead6ae282a..dce270271d 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderHeavy.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderHeavy.java @@ -16,8 +16,7 @@ public class EntityTenderHeavy extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderHeavy(null), Info.modID+":+train_tender_heavy", Traincraft.tcTab); - public EntityTenderHeavy(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderHeavy(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderMILW.java b/src/main/java/train/common/entity/stock/tender/EntityTenderMILW.java index cb1b3e75fd..5147951200 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderMILW.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderMILW.java @@ -16,8 +16,7 @@ public class EntityTenderMILW extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderMILW(null), Info.modID+":+train_milw_tender", Traincraft.tcTab); - public EntityTenderMILW(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderMILW(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTenderSmall.java b/src/main/java/train/common/entity/stock/tender/EntityTenderSmall.java index 40ab27c456..8d0aff95b4 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTenderSmall.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTenderSmall.java @@ -16,8 +16,7 @@ public class EntityTenderSmall extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTenderSmall(null), Info.modID+":+train_tender", Traincraft.tcTab); - public EntityTenderSmall(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTenderSmall(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTender_C41.java b/src/main/java/train/common/entity/stock/tender/EntityTender_C41.java index 58ea893303..61e73dfe7c 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTender_C41.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTender_C41.java @@ -16,8 +16,7 @@ public class EntityTender_C41 extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTender_C41(null), Info.modID+":+train_tender_c41", Traincraft.tcTab); - public EntityTender_C41(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTender_C41(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/tender/EntityTender_Southern1102.java b/src/main/java/train/common/entity/stock/tender/EntityTender_Southern1102.java index 17513b06bb..65d7162562 100644 --- a/src/main/java/train/common/entity/stock/tender/EntityTender_Southern1102.java +++ b/src/main/java/train/common/entity/stock/tender/EntityTender_Southern1102.java @@ -16,8 +16,7 @@ public class EntityTender_Southern1102 extends Tender { public static final Item thisItem = new ItemRollingStock(new EntityTender_Southern1102(null), Info.modID+":+train_southern1102tender", Traincraft.tcTab); - public EntityTender_Southern1102(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityTender_Southern1102(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/work/EntityCabooseLogging.java b/src/main/java/train/common/entity/stock/work/EntityCabooseLogging.java index e88ab119c7..d6c86d1d66 100644 --- a/src/main/java/train/common/entity/stock/work/EntityCabooseLogging.java +++ b/src/main/java/train/common/entity/stock/work/EntityCabooseLogging.java @@ -16,8 +16,7 @@ public class EntityCabooseLogging extends AbstractWorkCart { public static final Item thisItem = new ItemRollingStock(new EntityCabooseLogging(null), Info.modID+":+train_logging_caboose", Traincraft.tcTab); - public EntityCabooseLogging(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityCabooseLogging(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/work/EntityCabooseLoggingPRR.java b/src/main/java/train/common/entity/stock/work/EntityCabooseLoggingPRR.java index b145b24364..110540349e 100644 --- a/src/main/java/train/common/entity/stock/work/EntityCabooseLoggingPRR.java +++ b/src/main/java/train/common/entity/stock/work/EntityCabooseLoggingPRR.java @@ -16,8 +16,7 @@ public class EntityCabooseLoggingPRR extends AbstractWorkCart { public static final Item thisItem = new ItemRollingStock(new EntityCabooseLoggingPRR(null), Info.modID+":+train_prr_caboose", Traincraft.tcTab); - public EntityCabooseLoggingPRR(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityCabooseLoggingPRR(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/work/EntityCabooseWorkCart.java b/src/main/java/train/common/entity/stock/work/EntityCabooseWorkCart.java index df17f81488..af0aa6dd95 100644 --- a/src/main/java/train/common/entity/stock/work/EntityCabooseWorkCart.java +++ b/src/main/java/train/common/entity/stock/work/EntityCabooseWorkCart.java @@ -16,8 +16,7 @@ public class EntityCabooseWorkCart extends AbstractWorkCart { public static final Item thisItem = new ItemRollingStock(new EntityCabooseWorkCart(null), Info.modID+":+train_caboose_work", Traincraft.tcTab); - public EntityCabooseWorkCart(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityCabooseWorkCart(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/work/EntityGWRBrakeVan.java b/src/main/java/train/common/entity/stock/work/EntityGWRBrakeVan.java index fa2530d60f..01f127f6e4 100644 --- a/src/main/java/train/common/entity/stock/work/EntityGWRBrakeVan.java +++ b/src/main/java/train/common/entity/stock/work/EntityGWRBrakeVan.java @@ -16,8 +16,7 @@ public class EntityGWRBrakeVan extends AbstractWorkCart { public static final Item thisItem = new ItemRollingStock(new EntityGWRBrakeVan(null), Info.modID+":+train_gwr_brakevan", Traincraft.tcTab); - public EntityGWRBrakeVan(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityGWRBrakeVan(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/work/EntityMailWagen_DB.java b/src/main/java/train/common/entity/stock/work/EntityMailWagen_DB.java index 42ca45e55a..340cfd7870 100644 --- a/src/main/java/train/common/entity/stock/work/EntityMailWagen_DB.java +++ b/src/main/java/train/common/entity/stock/work/EntityMailWagen_DB.java @@ -16,8 +16,7 @@ public class EntityMailWagen_DB extends AbstractWorkCart { public static final Item thisItem = new ItemRollingStock(new EntityMailWagen_DB(null), Info.modID+":+train_mail", Traincraft.tcTab); - public EntityMailWagen_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityMailWagen_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/work/EntityPassengerRheingoldDining1.java b/src/main/java/train/common/entity/stock/work/EntityPassengerRheingoldDining1.java index 86b8ae7c1b..97f010a6d2 100644 --- a/src/main/java/train/common/entity/stock/work/EntityPassengerRheingoldDining1.java +++ b/src/main/java/train/common/entity/stock/work/EntityPassengerRheingoldDining1.java @@ -16,8 +16,7 @@ public class EntityPassengerRheingoldDining1 extends AbstractWorkCart { public static final Item thisItem = new ItemRollingStock(new EntityPassengerRheingoldDining1(null), Info.modID+":+train_passenger_rheingolddining1", Traincraft.tcTab); - public EntityPassengerRheingoldDining1(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerRheingoldDining1(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/work/EntityPassengerRheingoldDining2.java b/src/main/java/train/common/entity/stock/work/EntityPassengerRheingoldDining2.java index bda9a0b767..1688f07c6e 100644 --- a/src/main/java/train/common/entity/stock/work/EntityPassengerRheingoldDining2.java +++ b/src/main/java/train/common/entity/stock/work/EntityPassengerRheingoldDining2.java @@ -16,8 +16,7 @@ public class EntityPassengerRheingoldDining2 extends AbstractWorkCart { public static final Item thisItem = new ItemRollingStock(new EntityPassengerRheingoldDining2(null), Info.modID+":+train_passenger_rheingolddining2", Traincraft.tcTab); - public EntityPassengerRheingoldDining2(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityPassengerRheingoldDining2(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/stock/work/EntityWorkCart.java b/src/main/java/train/common/entity/stock/work/EntityWorkCart.java index 62e592a05f..b93348f455 100644 --- a/src/main/java/train/common/entity/stock/work/EntityWorkCart.java +++ b/src/main/java/train/common/entity/stock/work/EntityWorkCart.java @@ -16,8 +16,7 @@ public class EntityWorkCart extends AbstractWorkCart { public static final Item thisItem = new ItemRollingStock(new EntityWorkCart(null), Info.modID+":+train_work", Traincraft.tcTab); - public EntityWorkCart(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityWorkCart(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDiesel44TonSwitcher.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDiesel44TonSwitcher.java index 63f016eb5c..24d5bd6fa9 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDiesel44TonSwitcher.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDiesel44TonSwitcher.java @@ -16,8 +16,7 @@ public class EntityLocoDiesel44TonSwitcher extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDiesel44TonSwitcher(null), Info.modID+":+train_44tonner", Traincraft.tcTab); - public EntityLocoDiesel44TonSwitcher(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDiesel44TonSwitcher(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselBamboo.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselBamboo.java index 3e525fbf43..0ba931ca1e 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselBamboo.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselBamboo.java @@ -16,8 +16,7 @@ public class EntityLocoDieselBamboo extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselBamboo(null), Info.modID+":+train_train_bamboo", Traincraft.tcTab); - public EntityLocoDieselBamboo(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselBamboo(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselCD742.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselCD742.java index 3b29eb9051..ce4e7b679c 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselCD742.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselCD742.java @@ -16,8 +16,7 @@ public class EntityLocoDieselCD742 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselCD742(null), Info.modID+":+train_cd742", Traincraft.tcTab); - public EntityLocoDieselCD742(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselCD742(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselChME3.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselChME3.java index b0a283d766..2448e82434 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselChME3.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselChME3.java @@ -16,8 +16,7 @@ public class EntityLocoDieselChME3 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselChME3(null), Info.modID+":+train_chme3", Traincraft.tcTab); - public EntityLocoDieselChME3(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselChME3(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselClass66.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselClass66.java index 53b55e601c..9c2f698758 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselClass66.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselClass66.java @@ -16,8 +16,7 @@ public class EntityLocoDieselClass66 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselClass66(null), Info.modID+":+train_ewsclass66", Traincraft.tcTab); - public EntityLocoDieselClass66(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselClass66(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselDD35A.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselDD35A.java index f37e6de0e9..297fb421d9 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselDD35A.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselDD35A.java @@ -16,8 +16,7 @@ public class EntityLocoDieselDD35A extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselDD35A(null), Info.modID+":+train_dd35a", Traincraft.tcTab); - public EntityLocoDieselDD35A(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselDD35A(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselDeltic.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselDeltic.java index b71ff4b757..384dd7900b 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselDeltic.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselDeltic.java @@ -16,8 +16,7 @@ public class EntityLocoDieselDeltic extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselDeltic(null), Info.modID+":+train_deltic", Traincraft.tcTab); - public EntityLocoDieselDeltic(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselDeltic(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselEMDF3.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselEMDF3.java index adfea1e50c..59f562f89d 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselEMDF3.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselEMDF3.java @@ -16,8 +16,7 @@ public class EntityLocoDieselEMDF3 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselEMDF3(null), Info.modID+":+train_emdf3", Traincraft.tcTab); - public EntityLocoDieselEMDF3(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselEMDF3(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselEMDF7.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselEMDF7.java index a530bd766a..b784c3db7d 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselEMDF7.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselEMDF7.java @@ -16,8 +16,7 @@ public class EntityLocoDieselEMDF7 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselEMDF7(null), Info.modID+":+train_emdf7", Traincraft.tcTab); - public EntityLocoDieselEMDF7(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselEMDF7(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselFOLM1.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselFOLM1.java index 5e3bad1603..7d601f7549 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselFOLM1.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselFOLM1.java @@ -16,8 +16,7 @@ public class EntityLocoDieselFOLM1 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselFOLM1(null), Info.modID+":+train_fol_m1", Traincraft.tcTab); - public EntityLocoDieselFOLM1(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselFOLM1(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselFOLM1B.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselFOLM1B.java index 5e7ad91fb4..1f73b8b982 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselFOLM1B.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselFOLM1B.java @@ -16,8 +16,7 @@ public class EntityLocoDieselFOLM1B extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselFOLM1B(null), Info.modID+":+folm1b", Traincraft.tcTab); - public EntityLocoDieselFOLM1B(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselFOLM1B(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselGP7Red.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselGP7Red.java index f3d516dada..f7d87fa5d4 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselGP7Red.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselGP7Red.java @@ -16,8 +16,7 @@ public class EntityLocoDieselGP7Red extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselGP7Red(null), Info.modID+":+train_gp7", Traincraft.tcTab); - public EntityLocoDieselGP7Red(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselGP7Red(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselIC4_DSB_MG.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselIC4_DSB_MG.java index 0f346e64ca..ff5db36d41 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselIC4_DSB_MG.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselIC4_DSB_MG.java @@ -16,8 +16,7 @@ public class EntityLocoDieselIC4_DSB_MG extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselIC4_DSB_MG(null), Info.modID+":+train_ic4_dsb_mg", Traincraft.tcTab); - public EntityLocoDieselIC4_DSB_MG(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselIC4_DSB_MG(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselKof_DB.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselKof_DB.java index 5f081394c0..e224f0598d 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselKof_DB.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselKof_DB.java @@ -16,8 +16,7 @@ public class EntityLocoDieselKof_DB extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselKof_DB(null), Info.modID+":+train_kof", Traincraft.tcTab); - public EntityLocoDieselKof_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselKof_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselMILW_H1044.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselMILW_H1044.java index e183e9c43b..77664358b0 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselMILW_H1044.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselMILW_H1044.java @@ -16,8 +16,7 @@ public class EntityLocoDieselMILW_H1044 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselMILW_H1044(null), Info.modID+":+MILW_H1044", Traincraft.tcTab); - public EntityLocoDieselMILW_H1044(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselMILW_H1044(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselSD40.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselSD40.java index d8c2bff833..fb90728921 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselSD40.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselSD40.java @@ -16,8 +16,7 @@ public class EntityLocoDieselSD40 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselSD40(null), Info.modID+":+train_sd40", Traincraft.tcTab); - public EntityLocoDieselSD40(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselSD40(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselSD70.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselSD70.java index 056ba3aa93..659315b4e4 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselSD70.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselSD70.java @@ -16,8 +16,7 @@ public class EntityLocoDieselSD70 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselSD70(null), Info.modID+":+train_sd70", Traincraft.tcTab); - public EntityLocoDieselSD70(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselSD70(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselShunter.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselShunter.java index bc2fc17f86..24bb44c7dd 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselShunter.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselShunter.java @@ -16,8 +16,7 @@ public class EntityLocoDieselShunter extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselShunter(null), Info.modID+":+train_shunter", Traincraft.tcTab); - public EntityLocoDieselShunter(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselShunter(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselV60_DB.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselV60_DB.java index 488da7a55b..f8c2fb26a5 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselV60_DB.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselV60_DB.java @@ -16,8 +16,7 @@ public class EntityLocoDieselV60_DB extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselV60_DB(null), Info.modID+":+train_v60", Traincraft.tcTab); - public EntityLocoDieselV60_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselV60_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselWLs40.java b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselWLs40.java index 3ac013ab05..fa41bacb4a 100644 --- a/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselWLs40.java +++ b/src/main/java/train/common/entity/trains/diesel/EntityLocoDieselWLs40.java @@ -16,8 +16,7 @@ public class EntityLocoDieselWLs40 extends DieselTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoDieselWLs40(null), Info.modID+":+train_wls40", Traincraft.tcTab); - public EntityLocoDieselWLs40(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoDieselWLs40(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBP4.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBP4.java index 2c4ab609aa..0ddb963982 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBP4.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBP4.java @@ -16,8 +16,7 @@ public class EntityLocoElectricBP4 extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricBP4(null), Info.modID+":+train_bp4", Traincraft.tcTab); - public EntityLocoElectricBP4(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricBP4(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBR185.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBR185.java index 12d8e1eb81..5a6dd2782e 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBR185.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBR185.java @@ -16,8 +16,7 @@ public class EntityLocoElectricBR185 extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricBR185(null), Info.modID+":+train_br101", Traincraft.tcTab); - public EntityLocoElectricBR185(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricBR185(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBR_E69.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBR_E69.java index 39b80eccad..9c30ad8286 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBR_E69.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricBR_E69.java @@ -16,8 +16,7 @@ public class EntityLocoElectricBR_E69 extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricBR_E69(null), Info.modID+":+train_bre69", Traincraft.tcTab); - public EntityLocoElectricBR_E69(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricBR_E69(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricCD151.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricCD151.java index 51b6aa577c..4705a32fb0 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricCD151.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricCD151.java @@ -16,8 +16,7 @@ public class EntityLocoElectricCD151 extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricCD151(null), Info.modID+":+train_CD151", Traincraft.tcTab); - public EntityLocoElectricCD151(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricCD151(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricClass85.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricClass85.java index a8d803ca95..c3c6e35a0f 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricClass85.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricClass85.java @@ -16,8 +16,7 @@ public class EntityLocoElectricClass85 extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricClass85(null), Info.modID+":+train_class85", Traincraft.tcTab); - public EntityLocoElectricClass85(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricClass85(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricE103.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricE103.java index e76ce7c045..a4063d9994 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricE103.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricE103.java @@ -16,8 +16,7 @@ public class EntityLocoElectricE103 extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricE103(null), Info.modID+":+train_e103", Traincraft.tcTab); - public EntityLocoElectricE103(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricE103(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricE10_DB.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricE10_DB.java index 272c8ea2d8..2741779577 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricE10_DB.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricE10_DB.java @@ -16,8 +16,7 @@ public class EntityLocoElectricE10_DB extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricE10_DB(null), Info.modID+":+train_e10db", Traincraft.tcTab); - public EntityLocoElectricE10_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricE10_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricHighSpeedZeroED.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricHighSpeedZeroED.java index 2bb3a334b5..2fcb790585 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricHighSpeedZeroED.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricHighSpeedZeroED.java @@ -16,8 +16,7 @@ public class EntityLocoElectricHighSpeedZeroED extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricHighSpeedZeroED(null), Info.modID+":+train_high_speed_loco_zeroed", Traincraft.tcTab); - public EntityLocoElectricHighSpeedZeroED(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricHighSpeedZeroED(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricICE1.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricICE1.java index 550b74def2..389f695c00 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricICE1.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricICE1.java @@ -16,8 +16,7 @@ public class EntityLocoElectricICE1 extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricICE1(null), Info.modID+":+train_ice1", Traincraft.tcTab); - public EntityLocoElectricICE1(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricICE1(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricMinetrain.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricMinetrain.java index a16328e91d..5d645cc5cb 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricMinetrain.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricMinetrain.java @@ -16,8 +16,7 @@ public class EntityLocoElectricMinetrain extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricMinetrain(null), Info.modID+":+train_mine_train", Traincraft.tcTab); - public EntityLocoElectricMinetrain(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricMinetrain(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricTramNY.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricTramNY.java index 0bf805ef17..bce8da5a95 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricTramNY.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricTramNY.java @@ -16,8 +16,7 @@ public class EntityLocoElectricTramNY extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricTramNY(null), Info.modID+":+train_tram_ny", Traincraft.tcTab); - public EntityLocoElectricTramNY(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricTramNY(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricTramWood.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricTramWood.java index 644ad8545c..b9333a1dfe 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricTramWood.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricTramWood.java @@ -16,8 +16,7 @@ public class EntityLocoElectricTramWood extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricTramWood(null), Info.modID+":+train_tram", Traincraft.tcTab); - public EntityLocoElectricTramWood(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricTramWood(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricVL10.java b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricVL10.java index b7b33af4dd..bf785cb659 100644 --- a/src/main/java/train/common/entity/trains/electric/EntityLocoElectricVL10.java +++ b/src/main/java/train/common/entity/trains/electric/EntityLocoElectricVL10.java @@ -16,8 +16,7 @@ public class EntityLocoElectricVL10 extends ElectricTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoElectricVL10(null), Info.modID+":+train_vl10", Traincraft.tcTab); - public EntityLocoElectricVL10(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoElectricVL10(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteam040VB.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteam040VB.java index 60603aeb9b..2bd0c9fc10 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteam040VB.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteam040VB.java @@ -16,8 +16,7 @@ public class EntityLocoSteam040VB extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteam040VB(null), Info.modID+":+train_040VB", Traincraft.tcTab); - public EntityLocoSteam040VB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteam040VB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteam262T.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteam262T.java index 7bc0e03108..1d6e97bd60 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteam262T.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteam262T.java @@ -16,8 +16,7 @@ public class EntityLocoSteam262T extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteam262T(null), Info.modID+":+train_262t", Traincraft.tcTab); - public EntityLocoSteam262T(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteam262T(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteam4_4_0.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteam4_4_0.java index bb983923a1..c56b29aefa 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteam4_4_0.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteam4_4_0.java @@ -16,8 +16,7 @@ public class EntityLocoSteam4_4_0 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteam4_4_0(null), Info.modID+":+train_steam_normal", Traincraft.tcTab); - public EntityLocoSteam4_4_0(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteam4_4_0(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAdler.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAdler.java index 60552760af..d136ff896f 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAdler.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAdler.java @@ -16,8 +16,7 @@ public class EntityLocoSteamAdler extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamAdler(null), Info.modID+":+train_adler", Traincraft.tcTab); - public EntityLocoSteamAdler(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamAdler(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAlcoSC4.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAlcoSC4.java index 376ded136f..22497ae372 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAlcoSC4.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAlcoSC4.java @@ -16,8 +16,7 @@ public class EntityLocoSteamAlcoSC4 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamAlcoSC4(null), Info.modID+":+train_alcosc4", Traincraft.tcTab); - public EntityLocoSteamAlcoSC4(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamAlcoSC4(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAlice0_4_0.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAlice0_4_0.java index d3f5b88b0f..6fff93cfaf 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAlice0_4_0.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamAlice0_4_0.java @@ -16,8 +16,7 @@ public class EntityLocoSteamAlice0_4_0 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamAlice0_4_0(null), Info.modID+":+train_alice", Traincraft.tcTab); - public EntityLocoSteamAlice0_4_0(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamAlice0_4_0(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBR01_DB.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBR01_DB.java index 5a04e8e840..b96b4c07f6 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBR01_DB.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBR01_DB.java @@ -16,8 +16,7 @@ public class EntityLocoSteamBR01_DB extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamBR01_DB(null), Info.modID+":+train_br01", Traincraft.tcTab); - public EntityLocoSteamBR01_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamBR01_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBR80_DB.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBR80_DB.java index e0ee20e358..f466828d65 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBR80_DB.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBR80_DB.java @@ -16,8 +16,7 @@ public class EntityLocoSteamBR80_DB extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamBR80_DB(null), Info.modID+":+train_br80", Traincraft.tcTab); - public EntityLocoSteamBR80_DB(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamBR80_DB(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBerk1225.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBerk1225.java index 1a1c31a781..6e9d23413c 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBerk1225.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBerk1225.java @@ -16,8 +16,7 @@ public class EntityLocoSteamBerk1225 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamBerk1225(null), Info.modID+":+Berkshire1225", Traincraft.tcTab); - public EntityLocoSteamBerk1225(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamBerk1225(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBerk765.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBerk765.java index 97f6e07251..7d6caa08d7 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBerk765.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamBerk765.java @@ -16,8 +16,7 @@ public class EntityLocoSteamBerk765 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamBerk765(null), Info.modID+":+Berkshire765", Traincraft.tcTab); - public EntityLocoSteamBerk765(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamBerk765(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41.java index db88c172b8..fc124d36fe 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41.java @@ -16,8 +16,7 @@ public class EntityLocoSteamC41 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamC41(null), Info.modID+":+train_c41", Traincraft.tcTab); - public EntityLocoSteamC41(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamC41(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41T.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41T.java index b1417b0e97..0560c1ec57 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41T.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41T.java @@ -16,8 +16,7 @@ public class EntityLocoSteamC41T extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamC41T(null), Info.modID+":+train_c41t", Traincraft.tcTab); - public EntityLocoSteamC41T(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamC41T(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41_080.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41_080.java index 5ec51ed6c2..2dcc273889 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41_080.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC41_080.java @@ -16,8 +16,7 @@ public class EntityLocoSteamC41_080 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamC41_080(null), Info.modID+":+train_c41_080", Traincraft.tcTab); - public EntityLocoSteamC41_080(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamC41_080(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC62Class.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC62Class.java index eb3de291f6..b48a7ba7a0 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC62Class.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamC62Class.java @@ -16,8 +16,7 @@ public class EntityLocoSteamC62Class extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamC62Class(null), Info.modID+":+train_loco_c62_class", Traincraft.tcTab); - public EntityLocoSteamC62Class(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamC62Class(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamCherepanov.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamCherepanov.java index 55ed3c5504..d9380831b8 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamCherepanov.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamCherepanov.java @@ -16,8 +16,7 @@ public class EntityLocoSteamCherepanov extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamCherepanov(null), Info.modID+":+train_cherpanov", Traincraft.tcTab); - public EntityLocoSteamCherepanov(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamCherepanov(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamClimax.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamClimax.java index ba5be7ffcf..9c42bfb15c 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamClimax.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamClimax.java @@ -16,8 +16,7 @@ public class EntityLocoSteamClimax extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamClimax(null), Info.modID+":+train_climax", Traincraft.tcTab); - public EntityLocoSteamClimax(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamClimax(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamCoranationClass.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamCoranationClass.java index f02beb8123..fcd0362624 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamCoranationClass.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamCoranationClass.java @@ -16,8 +16,7 @@ public class EntityLocoSteamCoranationClass extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamCoranationClass(null), Info.modID+":+train_coronationclass", Traincraft.tcTab); - public EntityLocoSteamCoranationClass(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamCoranationClass(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamD51.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamD51.java index a8408ebb57..29e364be37 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamD51.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamD51.java @@ -16,8 +16,7 @@ public class EntityLocoSteamD51 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamD51(null), Info.modID+":+train_loco_d51s", Traincraft.tcTab); - public EntityLocoSteamD51(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamD51(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamD51Long.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamD51Long.java index 66de7a9204..d6f9aedec7 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamD51Long.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamD51Long.java @@ -16,8 +16,7 @@ public class EntityLocoSteamD51Long extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamD51Long(null), Info.modID+":+train_loco_d51", Traincraft.tcTab); - public EntityLocoSteamD51Long(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamD51Long(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamEr_Ussr.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamEr_Ussr.java index 1ab3e6e9d9..79061f246e 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamEr_Ussr.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamEr_Ussr.java @@ -16,8 +16,7 @@ public class EntityLocoSteamEr_Ussr extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamEr_Ussr(null), Info.modID+":+train_ussr", Traincraft.tcTab); - public EntityLocoSteamEr_Ussr(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamEr_Ussr(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamForneyRed.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamForneyRed.java index 2a1747a79b..b31d95e797 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamForneyRed.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamForneyRed.java @@ -16,8 +16,7 @@ public class EntityLocoSteamForneyRed extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamForneyRed(null), Info.modID+":+train_forney", Traincraft.tcTab); - public EntityLocoSteamForneyRed(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamForneyRed(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamFowler.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamFowler.java index 686815c9a1..39790b4402 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamFowler.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamFowler.java @@ -16,8 +16,7 @@ public class EntityLocoSteamFowler extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamFowler(null), Info.modID+":+Fowler 4F", Traincraft.tcTab); - public EntityLocoSteamFowler(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamFowler(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamGLYN042T.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamGLYN042T.java index 5edd4a4047..d922ad2ea3 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamGLYN042T.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamGLYN042T.java @@ -16,8 +16,7 @@ public class EntityLocoSteamGLYN042T extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamGLYN042T(null), Info.modID+":+train_glyn", Traincraft.tcTab); - public EntityLocoSteamGLYN042T(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamGLYN042T(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamGS4.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamGS4.java index fd97950268..1762be3164 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamGS4.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamGS4.java @@ -16,8 +16,7 @@ public class EntityLocoSteamGS4 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamGS4(null), Info.modID+":+GS4_engine", Traincraft.tcTab); - public EntityLocoSteamGS4(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamGS4(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamHallClass.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamHallClass.java index 5e19f95b2d..e952451715 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamHallClass.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamHallClass.java @@ -16,8 +16,7 @@ public class EntityLocoSteamHallClass extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamHallClass(null), Info.modID+":+HallClass", Traincraft.tcTab); - public EntityLocoSteamHallClass(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamHallClass(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamHeavy.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamHeavy.java index cb11081d73..9de96fa5fb 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamHeavy.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamHeavy.java @@ -16,8 +16,7 @@ public class EntityLocoSteamHeavy extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamHeavy(null), Info.modID+":+train_steam_heavy", Traincraft.tcTab); - public EntityLocoSteamHeavy(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamHeavy(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamKingClass.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamKingClass.java index 2c607cbddf..c513b5a630 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamKingClass.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamKingClass.java @@ -16,8 +16,7 @@ public class EntityLocoSteamKingClass extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamKingClass(null), Info.modID+":+KingClass", Traincraft.tcTab); - public EntityLocoSteamKingClass(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamKingClass(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamLSSP7.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamLSSP7.java index 1a2b58c14f..7680ec1f56 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamLSSP7.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamLSSP7.java @@ -16,8 +16,7 @@ public class EntityLocoSteamLSSP7 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamLSSP7(null), Info.modID+":+train_lssp7", Traincraft.tcTab); - public EntityLocoSteamLSSP7(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamLSSP7(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMILWClassA.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMILWClassA.java index 18f3503260..27837eb1aa 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMILWClassA.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMILWClassA.java @@ -16,8 +16,7 @@ public class EntityLocoSteamMILWClassA extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamMILWClassA(null), Info.modID+":+train_milw_class_a", Traincraft.tcTab); - public EntityLocoSteamMILWClassA(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamMILWClassA(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMallardA4.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMallardA4.java index 58e1c56ace..76bfe333e6 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMallardA4.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMallardA4.java @@ -16,8 +16,7 @@ public class EntityLocoSteamMallardA4 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamMallardA4(null), Info.modID+":+train_loco_a4_mallard", Traincraft.tcTab); - public EntityLocoSteamMallardA4(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamMallardA4(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMogulBlue.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMogulBlue.java index b3fb4e5e25..74753744af 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMogulBlue.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamMogulBlue.java @@ -16,8 +16,7 @@ public class EntityLocoSteamMogulBlue extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamMogulBlue(null), Info.modID+":+train_mogul", Traincraft.tcTab); - public EntityLocoSteamMogulBlue(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamMogulBlue(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamPannier.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamPannier.java index 312f5cc517..e6f46218e8 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamPannier.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamPannier.java @@ -16,8 +16,7 @@ public class EntityLocoSteamPannier extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamPannier(null), Info.modID+":+train_pannier", Traincraft.tcTab); - public EntityLocoSteamPannier(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamPannier(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamShay.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamShay.java index 44d3dcfb09..b2f850ccfd 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamShay.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamShay.java @@ -16,8 +16,7 @@ public class EntityLocoSteamShay extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamShay(null), Info.modID+":+train_shay", Traincraft.tcTab); - public EntityLocoSteamShay(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamShay(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSmall.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSmall.java index 8cd3cff733..5785cdf5c5 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSmall.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSmall.java @@ -16,8 +16,7 @@ public class EntityLocoSteamSmall extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamSmall(null), Info.modID+":+train_steam_small", Traincraft.tcTab); - public EntityLocoSteamSmall(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamSmall(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSnowPlow.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSnowPlow.java index f2e514fa4f..354b9cfa3e 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSnowPlow.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSnowPlow.java @@ -16,8 +16,7 @@ public class EntityLocoSteamSnowPlow extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamSnowPlow(null), Info.modID+":+train_snowplow", Traincraft.tcTab); - public EntityLocoSteamSnowPlow(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamSnowPlow(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSouthern1102.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSouthern1102.java index 7e6bd9f8f6..9ebb30559d 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSouthern1102.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamSouthern1102.java @@ -16,8 +16,7 @@ public class EntityLocoSteamSouthern1102 extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamSouthern1102(null), Info.modID+":+train_southern1102", Traincraft.tcTab); - public EntityLocoSteamSouthern1102(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamSouthern1102(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamUSATCUK.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamUSATCUK.java index 5d3fbfa2ae..aa6b418812 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamUSATCUK.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamUSATCUK.java @@ -16,8 +16,7 @@ public class EntityLocoSteamUSATCUK extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamUSATCUK(null), Info.modID+":+train_S100UK", Traincraft.tcTab); - public EntityLocoSteamUSATCUK(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamUSATCUK(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamUSATCUS.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamUSATCUS.java index 0f4fc739b4..fa12d76938 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamUSATCUS.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamUSATCUS.java @@ -16,8 +16,7 @@ public class EntityLocoSteamUSATCUS extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamUSATCUS(null), Info.modID+":+train_S100US", Traincraft.tcTab); - public EntityLocoSteamUSATCUS(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamUSATCUS(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamVBShay.java b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamVBShay.java index 5d4c037a84..cadd39dc40 100644 --- a/src/main/java/train/common/entity/trains/steam/EntityLocoSteamVBShay.java +++ b/src/main/java/train/common/entity/trains/steam/EntityLocoSteamVBShay.java @@ -16,8 +16,7 @@ public class EntityLocoSteamVBShay extends SteamTrain { public static final Item thisItem = new ItemRollingStock(new EntityLocoSteamVBShay(null), Info.modID+":+train_vbshay", Traincraft.tcTab); - public EntityLocoSteamVBShay(World world, double x, double y, double z) { - super(world, x, y, z); } + public EntityLocoSteamVBShay(World world) { super (world); } //main stats diff --git a/src/main/java/train/common/generation/ComponentVillageTrainstation.java b/src/main/java/train/common/generation/ComponentVillageTrainstation.java index 646327f84d..5ffc4f8f3c 100644 --- a/src/main/java/train/common/generation/ComponentVillageTrainstation.java +++ b/src/main/java/train/common/generation/ComponentVillageTrainstation.java @@ -205,21 +205,21 @@ public boolean addComponentParts(World world, Random random, StructureBoundingBo if (structureboundingbox.isVecInside(j2, k2, l2)) { int rD = random.nextInt(8); - EntityRollingStock cart = new EntityFreightWood2(world,j2 + 0.5D, k2, l2 + 0.5D); + EntityRollingStock cart = new EntityFreightWood2(world); if (rD == 0) - cart = new EntityCaboose(world,j2 + 0.5D, k2, l2 + 0.5D); + cart = new EntityCaboose(world); if (rD == 1) - cart = new EntityCaboose3(world,j2 + 0.5D, k2, l2 + 0.5D); + cart = new EntityCaboose3(world); if (rD == 2) - cart = new EntityFreightCart(world,j2 + 0.5D, k2, l2 + 0.5D); + cart = new EntityFreightCart(world); if (rD == 3) - cart = new EntityPassenger2(world,j2 + 0.5D, k2, l2 + 0.5D); + cart = new EntityPassenger2(world); if (rD == 4) - cart = new EntityStockCar(world,j2 + 0.5D, k2, l2 + 0.5D); + cart = new EntityStockCar(world); if (rD == 5) - cart = new EntityBoxCartUS(world,j2 + 0.5D, k2, l2 + 0.5D); + cart = new EntityBoxCartUS(world); if (rD == 6) - cart = new EntityFreightCartSmall(world,j2 + 0.5D, k2, l2 + 0.5D); + cart = new EntityFreightCartSmall(world); cart.setLocationAndAngles(j2 + 0.5D, k2, l2 + 0.5D, 90.0F, 0.0F); cart.setTrainOwner("VillagerJoe"); if (rD == 4) {