1 files changed, 9 insertions, 73 deletions

diff --git a/Minecraft.World/RailTile.h b/Minecraft.World/RailTile.h
index 776d8454..eacbf05b 100644
--- a/Minecraft.World/RailTile.h
+++ b/Minecraft.World/RailTile.h
@@ -1,84 +1,20 @@
 #pragma once
-#include "Tile.h"
-#include "TilePos.h"
-#include "Definitions.h"
 
-class Random;
-class HitResult;
-class ChunkRebuildData;
+#include "BaseRailTile.h"
 
-using namespace std;
-
-class RailTile : public Tile
+class RailTile : public BaseRailTile
 {
-	friend class Tile;
 	friend class ChunkRebuildData;
-public:
-	static const int DIR_FLAT_Z = 0;
-    static const int DIR_FLAT_X = 1;
-    // the data bit is used by boosters and detectors, so they can't turn
-    static const int RAIL_DATA_BIT = 8;
-    static const int RAIL_DIRECTION_MASK = 7;
 
 private:
 	Icon *iconTurn;
-
-	bool usesDataBit;
-
-     class Rail
-	 {
-		 friend class RailTile;
-	 private:
-		Level *level;
-        int x, y, z;
-        bool usesDataBit;
-        vector<TilePos *> connections;
-		bool m_bValidRail; // 4J added
-
-	 public:
-		 Rail(Level *level, int x, int y, int z);
-		 ~Rail();
-	 private:
-		 void updateConnections(int direction);
-		void removeSoftConnections();
-		bool hasRail(int x, int y, int z);
-		Rail *getRail(TilePos *p);
-		bool connectsTo(Rail *rail);
-		bool hasConnection(int x, int y, int z);
-		int countPotentialConnections();
-		bool canConnectTo(Rail *rail);
-	 private:
-		void connectTo(Rail *rail);
-		bool hasNeighborRail(int x, int y, int z);
-	 public:
-        void place(bool hasSignal, bool first);
-	};
+	
 public:
-	static bool isRail(Level *level, int x, int y, int z);
-    static bool isRail(int id);
-protected:
-	RailTile(int id, bool usesDataBit);
-public:
-	using Tile::getResourceCount;
+	RailTile(int id);
 
-	bool isUsesDataBit();
-    virtual AABB *getAABB(Level *level, int x, int y, int z);
-    virtual bool blocksLight();
-    virtual bool isSolidRender(bool isServerLevel = false);
-    virtual HitResult *clip(Level *level, int xt, int yt, int zt, Vec3 *a, Vec3 *b);
-    virtual void updateShape(LevelSource *level, int x, int y, int z, int forceData = -1, shared_ptr<TileEntity> forceEntity = shared_ptr<TileEntity>());	// 4J added forceData, forceEntity param
-    virtual Icon *getTexture(int face, int data);
-	virtual bool isCubeShaped();
-    virtual int getRenderShape();
-    virtual int getResourceCount(Random random);
-    virtual bool mayPlace(Level *level, int x, int y, int z);
-    virtual void onPlace(Level *level, int x, int y, int z);
-    virtual void neighborChanged(Level *level, int x, int y, int z, int type);
-private:
-	void updateDir(Level *level, int x, int y, int z, bool first);
-    bool findGoldenRailSignal(Level *level, int x, int y, int z, int data, bool forward, int searchDepth);
-    bool isGoldenRailWithPower(Level *level, int x, int y, int z, bool forward, int searchDepth, int dir);
-public:
-	virtual int getPistonPushReaction();
+	Icon *getTexture(int face, int data);
 	void registerIcons(IconRegister *iconRegister);
-};
+
+protected:
+	void updateState(Level *level, int x, int y, int z, int data, int dir, int type);
+};
\ No newline at end of file