From 36319afbbef29e58d5b136f2ad8113ee524a53de Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 28 Aug 2017 16:59:10 +0200
Subject: [PATCH] Basic powered rails implementation

---
 mods/ENTITIES/mcl_minecarts/functions.lua     |  10 ---
 mods/ENTITIES/mcl_minecarts/init.lua          |  26 +++---
 mods/ENTITIES/mcl_minecarts/rails.lua         |  79 ++++++++++++++----
 .../textures/carts_rail_crossing_pwr.png      | Bin 562 -> 263 bytes
 .../textures/carts_rail_curved_pwr.png        | Bin 459 -> 223 bytes
 .../mcl_minecarts/textures/carts_rail_pwr.png | Bin 276 -> 256 bytes
 .../textures/carts_rail_t_junction_pwr.png    | Bin 596 -> 258 bytes
 .../textures/default_rail_crossing.png        | Bin 542 -> 247 bytes
 .../textures/default_rail_t_junction.png      | Bin 576 -> 238 bytes
 ...minecarts_rail_golden_crossing_powered.png | Bin 0 -> 263 bytes
 ...l_minecarts_rail_golden_curved_powered.png | Bin 0 -> 223 bytes
 .../mcl_minecarts_rail_golden_powered.png     | Bin 0 -> 257 bytes
 ...necarts_rail_golden_t_junction_powered.png | Bin 0 -> 254 bytes
 .../mcl_minecarts/textures/rail_detector.png  | Bin 300 -> 283 bytes
 .../textures/rail_detector_powered.png        | Bin 299 -> 277 bytes
 .../textures/rail_golden_powered.png          | Bin 281 -> 0 bytes
 16 files changed, 78 insertions(+), 37 deletions(-)
 create mode 100644 mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_crossing_powered.png
 create mode 100644 mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_curved_powered.png
 create mode 100644 mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_powered.png
 create mode 100644 mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_t_junction_powered.png
 delete mode 100644 mods/ENTITIES/mcl_minecarts/textures/rail_golden_powered.png

diff --git a/mods/ENTITIES/mcl_minecarts/functions.lua b/mods/ENTITIES/mcl_minecarts/functions.lua
index 1a298841e..42cdecd12 100644
--- a/mods/ENTITIES/mcl_minecarts/functions.lua
+++ b/mods/ENTITIES/mcl_minecarts/functions.lua
@@ -138,13 +138,3 @@ function mcl_minecarts:get_rail_direction(pos_, dir, ctrl, old_switch, railtype)
 	return {x=0, y=0, z=0}
 end
 
-function mcl_minecarts:boost_rail(pos, amount)
-	minetest.get_meta(pos):set_string("cart_acceleration", tostring(amount))
-	for _,obj_ in ipairs(minetest.get_objects_inside_radius(pos, 0.5)) do
-		if not obj_:is_player() and
-				obj_:get_luaentity() and
-				obj_:get_luaentity().name == "mcl_minecarts:minecart" then
-			obj_:get_luaentity():on_punch()
-		end
-	end
-end
diff --git a/mods/ENTITIES/mcl_minecarts/init.lua b/mods/ENTITIES/mcl_minecarts/init.lua
index 23a95e725..5333613b3 100644
--- a/mods/ENTITIES/mcl_minecarts/init.lua
+++ b/mods/ENTITIES/mcl_minecarts/init.lua
@@ -31,6 +31,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick)
 		_start_pos = nil, -- Used to calculate distance for “On A Rail” achievement
 		_old_dir = {x=0, y=0, z=0},
 		_old_pos = nil,
+		_old_vel = {x=0, y=0, z=0},
 		_old_switch = 0,
 		_railtype = nil,
 	}
@@ -128,6 +129,18 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick)
 				ctrl = player:get_player_control()
 			end
 		end
+
+		-- Stop cart if velocity vector flips
+		if self._old_vel and self._old_vel.y == 0 and
+				(self._old_vel.x * vel.x < 0 or self._old_vel.z * vel.z < 0) then
+			self._old_vel = {x = 0, y = 0, z = 0}
+			self._old_pos = pos
+			self.object:setvelocity(vector.new())
+			self.object:setacceleration(vector.new())
+			return
+		end
+		self._old_vel = vector.new(vel)
+
 		if self._old_pos then
 			local diff = vector.subtract(self._old_pos, pos)
 			for _,v in ipairs({"x","y","z"}) do
@@ -187,17 +200,9 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick)
 			-- Slow down or speed up
 			local acc = dir.y * -1.8
 
-			local speed_mod = tonumber(minetest.get_meta(pos):get_string("cart_acceleration"))
+			local speed_mod = minetest.registered_nodes[minetest.get_node(pos).name]._rail_acceleration
 			if speed_mod and speed_mod ~= 0 then
-				if speed_mod > 0 then
-					for _,v in ipairs({"x","y","z"}) do
-						if math.abs(vel[v]) >= max_vel then
-							speed_mod = 0
-							break
-						end
-					end
-				end
-				acc = acc + (speed_mod * 8)
+				acc = acc + speed_mod
 			else
 				acc = acc - 0.4
 			end
@@ -214,6 +219,7 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick)
 		for _,v in ipairs({"x","y","z"}) do
 			if math.abs(vel[v]) > max_vel then
 				vel[v] = mcl_minecarts:get_sign(vel[v]) * max_vel
+				new_acc[v] = 0
 				update.vel = true
 			end
 		end
diff --git a/mods/ENTITIES/mcl_minecarts/rails.lua b/mods/ENTITIES/mcl_minecarts/rails.lua
index f68a738c9..fb2a97b12 100644
--- a/mods/ENTITIES/mcl_minecarts/rails.lua
+++ b/mods/ENTITIES/mcl_minecarts/rails.lua
@@ -33,11 +33,26 @@ minetest.register_craft({
 	}
 })
 
--- Rail to speed up
-minetest.register_node("mcl_minecarts:golden_rail", {
+-- Function that get the input/output rules of the powered rails
+local get_input_rules = function()
+	return {
+		{x = -1, y = 0, z = 0},
+		{x = 1, y = 0, z = 0},
+		{x = 0, y = 0, z = -1},
+		{x = 0, y = 0, z = 1},
+	}
+end
+
+local get_output_rules = function()
+	return {}
+end
+
+-- Powered rail
+
+local powered_rail_template = {
 	description = "Powered Rail",
-	_doc_items_longdesc = "Rails can be used to build transport tracks for minecarts. Powered rails will accelerate moving minecarts, up to a maximum speed.",
-	_doc_items_usagehelp = railuse,
+	_doc_items_longdesc = "Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.",
+	_doc_items_usagehelp = railuse .. "\n" .. "Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.",
 	drawtype = "raillike",
 	tiles = {"carts_rail_pwr.png", "carts_rail_curved_pwr.png", "carts_rail_t_junction_pwr.png", "carts_rail_crossing_pwr.png"},
 	inventory_image = "carts_rail_pwr.png",
@@ -47,31 +62,61 @@ minetest.register_node("mcl_minecarts:golden_rail", {
 	walkable = false,
 	selection_box = {
 		type = "fixed",
-		-- but how to specify the dimensions for curved and sideways rails?
 		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
 	},
 	groups = {handy=1,pickaxey=1, attached_node = 1, rail = 1, connect_to_raillike = 1, dig_by_water = 1,destroy_by_lava_flow=1, transport = 1},
-	
-	after_place_node = function(pos, placer, itemstack)
-		if not mesecon then
-			minetest.get_meta(pos):set_string("cart_acceleration", "0.5")
-		end
-	end,
+
 	sounds = mcl_sounds.node_sound_metal_defaults(),
 	mesecons = {
 		effector = {
 			action_on = function(pos, node)
-				mcl_minecarts:boost_rail(pos, 0.5)
-			end,
-			
-			action_off = function(pos, node)
-				minetest.get_meta(pos):set_string("cart_acceleration", "0")
+				minetest.swap_node(pos, {name = "mcl_minecarts:golden_rail_on", param2 = node.param2 })
+				mesecon:receptor_on(pos, get_input_rules())
 			end,
 		},
+		receptor = {
+			state = mesecon.state.off,
+			rules = get_output_rules,
+		},
 	},
+
+	_rail_acceleration = -3,
 	_mcl_blast_resistance = 3.5,
 	_mcl_hardness = 0.7,
-})
+}
+minetest.register_node("mcl_minecarts:golden_rail", powered_rail_template)
+
+
+-- Powered rail (activated by redstone)
+local powered_rail_on = table.copy(powered_rail_template)
+powered_rail_on.description = nil
+powered_rail_on._doc_items_create_entry = false
+powered_rail_on._doc_items_longdesc = nil
+powered_rail_on._doc_items_usagehelp = nil
+powered_rail_on.tiles = {"mcl_minecarts_rail_golden_powered.png", "mcl_minecarts_rail_golden_curved_powered.png", "mcl_minecarts_rail_golden_t_junction_powered.png", "mcl_minecarts_rail_golden_crossing_powered.png"}
+powered_rail_on.inventory_image = "mcl_minecarts_rail_golden_powered.png"
+powered_rail_on.wield_image = "mcl_minecarts_rail_golden_powered.png"
+powered_rail_on.groups.not_in_creative_inventory = 1
+powered_rail_on.groups.transport = nil
+powered_rail_on.mesecons = {
+	effector = {
+		action_off = function(pos, node)
+			minetest.swap_node(pos, {name = "mcl_minecarts:golden_rail", param2 = node.param2 })
+			mesecon:receptor_off(pos, get_input_rules())
+		end,
+	},
+	receptor = {
+		state = mesecon.state.on,
+		rules = get_output_rules,
+	}
+}
+powered_rail_on._rail_acceleration = 4
+
+minetest.register_node("mcl_minecarts:golden_rail_on", powered_rail_on)
+
+if minetest.get_modpath("doc") then
+	doc.add_entry_alias("nodes", "mcl_minecarts:golden_rail", "nodes", "mcl_minecarts:golden_rail_on")
+end
 
 minetest.register_craft({
 	output = "mcl_minecarts:golden_rail 6",
diff --git a/mods/ENTITIES/mcl_minecarts/textures/carts_rail_crossing_pwr.png b/mods/ENTITIES/mcl_minecarts/textures/carts_rail_crossing_pwr.png
index 9ea9335d6a39d0271c1290e45c80a18465e7187a..df8f6bfbe1b4c15053b372090b787ae39fb459f7 100644
GIT binary patch
delta 247
zcmV<T00{rG1cw5U7=Hu<0002(-QrRJ001gbOjJbx002ozNh~ZZJv}{qUrb_4J0=Va
zOdK4EYECsZH6tS<aaKg0d0^D1H4S99umAu60d!JMQvg8b*k%9#0E<aPK~#7FV_*<s
z00KoIHga_<i2yPLEoV-)oH^5wL21>hMOv#?DKT)*+H+=2w{Wrp1Iw(~yLYcDZeZZB
z+AFy5wqgSVyV2TJt8T3<U|=)y6<l~{WdZ}oERd9@0|P5qv2p-Vmq*76Z{-aPtCW<q
x7AYwyF$fA91MLtN1lqpUtvX~O1JoG{835n|Ecc<MQ8WMm002ovPDHLkV1f+2RgVAw

delta 549
zcmV+=0^0qD0<r{<7=H)`0000V^Z#K00004VQb$4nuFf3k0005(Nkl<ZILn2TO=uHQ
z5XXPJ6xo=SG<6T92%^E~*IEjK2eBxAAPeF}2zZGH!Mg`f^{A&py?gTmgn$Qw5=0MT
zdaajI#RUzL5~{9A7vK6853Yygy<};j|I^I;XJ+60cLs(Cf`1_MeLrId_`aV7L16MG
zv>~Mg;O>npSvTr4<CUpDe}|ZyWbVQo-Kfvu{d;-x{%fwGrMpQfNz*h(I*tRdC9XNw
zb+Pobl~P-h3WWkYaTdVs>cwoi9n<UexO(ycCo20);{AGyh3Y&%;~pE)AKrZ2pj<9<
z_F##7k6v060Dr}T1H=HtiQ?4knrZN2b_y8yOHX$J;JPk}N=G8@DcWY<Qn3L1<<4Ud
zfG`XZLa<nihTPyo)81|XY=BndgPE(b(l&)*7#bU(vC>8<MHEG*#s&yCH_el;pE(ME
z5CS2Du>lsU^CnN%*Z?<c=SkBPrIeX%JFI?LH|kffoqro?@cG*>lN2X|U$$6_hLI^C
z%5je4(2e?|1~Xon)gRx{_N$g{8a{lz#;wc8`JMcuR7{PC13|&6R4Uo{VvIvC&~}`;
z1uf9{J?Qn-h2tyjc^*<qT-P0KqQ1sXr^BUV)5M9&9n+!HM@;P5@+X84G@DH;ca0hk
n>Tj)aKOU44>g&eWBWwHzp1j6qgXux#00000NkvXXu0mjf!c+#s

diff --git a/mods/ENTITIES/mcl_minecarts/textures/carts_rail_curved_pwr.png b/mods/ENTITIES/mcl_minecarts/textures/carts_rail_curved_pwr.png
index a9ab6eeb42b79cbd432a7cd134821fd4bff02d6e..d557a358ae9e4ebd23c98f5f840fed43d0a7ba5e 100644
GIT binary patch
delta 207
zcmV;=05Jc{1K$CV7=Hu<0002(-QrRJ001peOjJbx002xJ95@mZNl8gHH8njwJuECN
zVoN)TYEB~~BXL$l>cL`sUre5PVAQ8IMr61e00001bW%=J06^y0W&i*HU`a$lRCobn
zKn08nP=>OrF_>l!PD=w)?9DFIz<e%~Y1|MAw*?S}Y5G|{Fi0beXYD<(j3-0$Jg^xF
z44jiehMLaa_s)0~0|S#M$b{)Y10zB5%bXb)%s`A(b0{PE6aZPU6DbclW6=Nr002ov
JPDHLkV1hgON0R^m

delta 445
zcmV;u0Yd)Y0m}oB7=H)`0000V^Z#K00004VQb$4nuFf3k0004nNkl<ZILp10u}d65
z6vlsJ4D7@a+4Tq-JVdsLjn#o3q_9b|Bv@LD|3M0o^hs?MOCc#QourF|fJK5J1hRxQ
zi`X0*hFR2+cOWvU?$o=BcU8V}nD6)Id+!bWPraO(3H2liw|~#nu;zM_gm`HQYb{X}
zVT=J_bQp7%Wx;z7fQTR>lx6wv7p%W{7M{*d^7ZHnYb^lIIkeW~d49(;(ho2(raNZm
z93nzd6za>n#h$x;0lzOEVy#6)SgFnRRJ|9_&MP7;&Q36<BX(Y|1%N-zpMwG3d&;sT
z&vW&p5_2gnfPW6;UO<**q19?3A^^O3|4B_%9`W(VDQ_G5eItzCo^yLlMNxDzZ*K3Z
zG))7*#)nD|K(#mQdSL<YJ<Vp5Z#&C$XKtJ4$FBg`YV4^Fpq?b*I!$rT-KpNKSF6v%
z?%@&3^HUrgpWXD}yK^dvqJbN^)!0)jwK)!s&(K;^tu|I~dSHw}YdsM1`PT_?9Ak`O
ndgOe#ztAmX47JA(xD?G_@4KI&NR%fS00000NkvXXu0mjfk+;q2

diff --git a/mods/ENTITIES/mcl_minecarts/textures/carts_rail_pwr.png b/mods/ENTITIES/mcl_minecarts/textures/carts_rail_pwr.png
index 712820326d7b9388fb79a90c3536a546e3ac344d..87a0b7bd562cc92fb150b2a3dd3239c3d4d54904 100644
GIT binary patch
delta 199
zcmV;&0671Y0)PUL7!(8p0002(-QrRJ001yhOjJcNF)oogEr0IO!@~do00DGTPE!Ct
z=GbNc004eTL_t(|0b^hgVgLd~AU1+BSi;=P%UhHuFmQ$~S~5#Z(Sd=>%)6swi(&&%
zF*gIl0c8dTULhVqfdk15417j8X=&S185sDDc#I7W02vHHJPZsQR2djJ!n|jcZ&97V
zz!kP=)e<e`1t>rRXLQb(qU^xHU<R=ZYI`Dr0RZBk8@rz%BkuqJ002ovPDHLkV1m0h
BM8W_7

delta 219
zcmV<103`o_0+a%f7$FD)0000eEe}%w0004VQb$4nuFf3k0000pP)t-s|NsAyEG>UA
zF)qxp8}I-C00DGTPE!Ct=GbNc004qXL_t&-(`}F23PUjn1ii(hCT;)!Z@bz;;n01E
zFqmYPh*;<w;Td`Zw%o2xm}mmz@{+Q|A#4DpZaa`|!qIo|=<az)wC4lh5Hlb00Z$b_
zj%@eU;HABxs@NDns{yh}1_V5I#&s{@m(?CM9#sYpt&dnnWJbc&ri<Uo{o49J@CMZ8
V16w|bmWBWT002ovPDHLkV1m_(TaN$$

diff --git a/mods/ENTITIES/mcl_minecarts/textures/carts_rail_t_junction_pwr.png b/mods/ENTITIES/mcl_minecarts/textures/carts_rail_t_junction_pwr.png
index 962d0a7029221f90187f5f8c25f793608fbf2ad7..042f3d1be0c62c370bd98c10dfedaec984c73c1c 100644
GIT binary patch
delta 242
zcmV<O01f}t1cCyP7=Hu<0002(-QrRJ001yhOjJbx002ozNh~ZZJv}{fRzx*5H6tS<
zo_S!2YEFD#Okztr>cL_-5)w=t9Mq>ZCJYQ$aS!nT0004WQchC<K<3zH0001hNkl<Z
zcmZQz5MlrVMIbhUGFZag%gY;s1sOQQ7A=`*sHDWeW#-iwnro!k094E(nzTWgfq_Se
zG01U4G6Mszk+9bE2dNAU{6<EcVju=XU>HN17?8mcsJ-u@Wa<P4F5#qAOS)7S01cec
sIb({d5(9%7$S$QosO`#9FlS5w0Jh;9<N&5o_W%F@07*qoM6N<$f+!JJ1ONa4

delta 583
zcmV-N0=WHx0@MVM7=H)`0000V^Z#K00004VQb$4nuFf3k0006GNkl<ZILn=rF=!J}
z9L9eaTe+8e;Yd70i$@57XyKfK!J(ldE(g+0p_AaKlY?||tb>bg9Sgb$-K@GfC@O_w
zrygPhp>zo}Uf(tL!aFGKIi$I^s8s!?2k-y?zwiHj--84AzJH&3o|ke0JkLvg-_PoD
z!$Ta${0|I(2e)sepVoUQrI@N$xLm#POX2sP;{EzAVHjeXCQ?cOMgS~f0zCkFea+L?
zUucwVY)fDXla=lsaU3J1L~D)Knkb462Xw*+(=-9FEkUCU7t3b`FRpI_pp-%g0f6he
zT&s*SGq-5u0DtD+em10(2qAd3@XoL;k<nF3p|xgdev%*vjG<mLbBjhM;?+{=nEKy#
zMhU|Ztu<5i3a;yBcUtRX+Kd1=`8>S?7kuAO<2XiZO`~jM36on@hi+#zYf6%YV>Y(7
zw>fHO6h#C<V2n9MR=RsUUikP&8wUg8*hrED*L6vfB!8nh`}~d3YPA4(_`;!Dt){;n
z@Z{c9dUVI7`ANDT?xw-ZE9tA*617?lfa!_xtntyEn`x%O+Qt@+<1pO)`u$}ZWg9pR
zz@@@2=bSui8(W!`o$yEw#+)LnUpG-oF+DL(!5Sodr@s$C!OF4I-^aE@7P#e&9-il=
z#*k98*+5J?oeu4G+c@bn0SF;*9B04)U>KyoL9tjwO3C@$kHZ1~0x2c+v#025!B1vs
V*M`pOj;jCw002ovPDHLkV1lza5*Ppg

diff --git a/mods/ENTITIES/mcl_minecarts/textures/default_rail_crossing.png b/mods/ENTITIES/mcl_minecarts/textures/default_rail_crossing.png
index 22556d38ddb3ff5b81f190bd4aec172548317641..409f14b8231d43f464edae502910b9305ea47591 100644
GIT binary patch
delta 231
zcmV<D02u$C1or`u7=Hu<0002(-QrRJ001FSOjJbx002ozNh~ZZJv}{qUrb_4JBeye
zH8nLOBO`HEM4owI1_j{a00001bW%=J06^y0W&i*Hgh@m}RCobnU=U&e0!1J;a!p_f
z12P27%Zts+%MBTnIy#y(Iy#gXI4fqYT9v8nz`#-w6zQs}IADQ+)nZCoTBc$GR98D#
z`vR6IAcL)9rrWBS>JAL76+xkqs>%UCU2Z9Ep2`y#I+T<&nv|537zBllfp!QB0&Sn_
hz!}oW0Ch$q0{};uASi{cr#b)t002ovPDHLkV1hIkP>uiq

delta 529
zcmV+s0`C3y0iFbq7=H)`0000V^Z#K00004VQb$4nuFf3k0005lNkl<ZILnQbF^CgE
z6o$VEDRyo*ENfN_hY&Tefn%)#*V-tuAjeg9VsB@a#_}2)?NSPdg&<b(Bt@>0vr)T)
zND7q@iK}iBmfO8eb!&4oNiOR7SHu72y*KZl|G_DOAjo~+&wn`wzVGKj5a@eFbx4u~
zfJgW5<fCXxy;`Q(YKybn^S57?3JO&%NfKtW*;3Fj41g70#VpH0sAp$cwsJ{I$$2pW
z@bK=<{NQWMWHMo^ah2<}%PR@L;t64NOt%-}I1V?i+3f7@i6Ve04Il;}PBWgo{>Wz4
z#x^CUG#Euw-hU5bHmf!OmSvG<v$=?)XsYM6P04n{p=1_x_qti8UM&+w$GTC)T?3#1
z@a)Yyq2^K@0h+D0XtvtoC_SM+7*lcA$g+$miu4Z^{`TJ&?F;|K34q5Bw(?gWzH1Sc
zE+w;|lMX+B1EAXrky3Jd<I-Hj{$Q*t#%VSeEP_5`Y=2YI?S)!I!<dg*1Xy<+4uAeY
zo$po4034+!0F=xE+l?!y%Ewx408y*e@<n4TLK)~!F}(|(=W%u)lzmm=qNQEeB}o!2
z%bJU*wsANda%-bPoMx=M4m-Ph+Np|raqtPx^XPOsVrd%{p1#}{|Kilh3cmqK{lX&-
TrJVQx015yANkvXXu0mjfJQwxv

diff --git a/mods/ENTITIES/mcl_minecarts/textures/default_rail_t_junction.png b/mods/ENTITIES/mcl_minecarts/textures/default_rail_t_junction.png
index fc5b3ba31411b3c5ce1e10666b4110758ad5da94..f25c510f53f243d9d570388bcf01b2dc4e4d4638 100644
GIT binary patch
delta 222
zcmV<403rXt1nvQl7=Hu<0002(-QrRJ001FSOjJbx002ozNh2d8EG#TFH8njwJ#kh<
zd|yn7YEEKHJDz!9Yx4EW00001bW%=J06^y0W&i*Hdr3q=RCobnU=U&e0z(EQhA<E_
zx(YI|1*f+c1{xbPa0X9qbWv8Bz`*XDCZb%X(!jvr%;=oJU{?ZE=p<@c#b63z1hXeE
z05Jlc7&@yAK@0;1j_E)Khp0wJN2lQg1~#Y3(=*KsjTzX3GFGixX6y*Di@{V9$}lVg
Y058rMkiWb;OaK4?07*qoM6N<$f{40I+yDRo

delta 563
zcmV-30?hsH0l);17=H)`0000V^Z#K00004VQb$4nuFf3k0005{Nkl<ZILoDzKWI}?
z6vlrqW_Z^;2{BR9LdXzkH3k=HrlN~M?&2so2u==ePU7z3qMKtu+?>SfAUG7krD-Q0
zf<scnljk3<@A2x5=ar(*!S>k@YX!gUUe5W>cg}YX>_BUswSQWzj04c=bTX}V9#`N$
zQQZ4bO8qrhYn>Tmu-3Ax!U4E(>3p{KVT(A9>9y;Wl*^G)fv@8q0IYxhj<pug^9X`q
zg0ujTj3xg_#=_(EcX{ITH=i)Z5QZT^5FjEbrRX-x_`dHH0A_0y(liC2TvGJfbyhaE
zF~$%@5hB9n#eb9Z+V#B9e6vd40>Hw;LM9^kzVGbzDkAjSb?!ZS;p}xmDMi2Eccxqr
z5wzBswH6Vf+bmO3E=#wrPT1?ZF8kVOttF0QeBXCwYZb<la(8)cie!qwbzSD>=19{N
zkzYf-{otunuN|h_EHeyEPU3mq{t85d!C;X0eDnSjXMes~B{VU^&`c?C0PbABn5}GV
zW343&L#|yo^~XheJNm-vD5244FjLrM>Deo%2=LK-!<d99ia2+o&cl~Oy3I1XGf2k5
z>L}T<F#%w8l+fvPvLZl9xw!6Dz6V#%RykHaI#GS`G`t?X2OtOnlv31cwcmT7wa$Vd
z!1sOUpe$>wR4RC$$4p^!@|gY=p67Aq_#wuk_z5OE-xZhtZR7v|002ovPDHLkV1i(u
B8595j

diff --git a/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_crossing_powered.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_crossing_powered.png
new file mode 100644
index 0000000000000000000000000000000000000000..81526029d480d777a968fa401fc3c46df4475b30
GIT binary patch
literal 263
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdsSyd_r6q7#KV~J#}<+Y;A38
z;(e05tqYi#rZY2lX8D<#nkp+R7lygat4z4E-1P28p?C%c2F8*gzhDN3XE)Lq7#O-e
zT^vIy7?TqOk{Fm=70ilCwL2M%Saj3<w#~7;Ji#&Z>MGZ$)nS^31?O)Sr}=K*#LRqp
z&5hmV>$UO{9&EU!z2n2SBxdH_7jK2G&ReUKkYM~tG^Qdwm5KSd&V(t;n3=UBHWo1i
zOm{!dmH(8NXZ4gRTf{UqH4Qnqq?z9eh_T$-cXh2*iX!tBNp4Ao2h2L(7cLDnVE}o_
L)z4*}Q$iB}@90)+

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_curved_powered.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_curved_powered.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff1b917e25688eeae40aec0bcfc5135dd3c96b94
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdq5|d_r6q7#OBAGZ!#1d3t)9
znwr|$+Un@&BzaqRX89>AD;I{jygHav6Yn#xGU3W{Q};tJ<}xraFqQ=Q1v5B2yOGAg
zz>whS;uuoFnC!sX!xhlBX|>^uG(JCX=Abuc^)4T%(VLukM}TuXt3X@kuSh!s<(~An
zwi|lXoj==bkmTf<Gug3i*13D%&sB&rGf!4O(el!PS=sT^={b@TXB>J$iZzsfiZDcO
X5Z2_kOuop#z`)??>gTe~DWM4f^SVg3

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_powered.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_powered.png
new file mode 100644
index 0000000000000000000000000000000000000000..c118032ef4b90b476b7ea791eb7950ef184bb3e9
GIT binary patch
literal 257
zcmV+c0sj7pP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000pP)t-sO+h+I
zNl7d$EImCvaaKe%H8mq6Bc6F+iE2)KUrb_4JJhE&>cL`y4GotA184#QZ~_8a?j)c9
z0004WQchC<K<3zH0001dNkl<ZcmZvX1p)#w3<M+FRFVI`mThpjsZT8t5jA;WnuGrc
zltA4yn0Ja^V%R`uX9|kpF?-ug(<Vf1NwUoMa8jG1suYpp>^3j4Sy8sQI<L69$U{h>
zNT#J|C1&r9aZq%Mk#URx8|LF47{lP14s!_c_(|@aZ5)Xk<lF;yW}gg&00000NkvXX
Hu0mjf@KaiO

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_t_junction_powered.png b/mods/ENTITIES/mcl_minecarts/textures/mcl_minecarts_rail_golden_t_junction_powered.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a4af02094c9c0bc4faa0ad357879e720e1cd23b
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdq5|d_r6q7#KV~J#}<+Y;A1|
z!(2>FO_i0E=T#<jX8F~``y_c=zdD#yz{E72nfc0c)0T9e5(Wka#*!evU<QY0H_{jw
z80tM;978G?lM@7z7?@lY%$kfM4&6C@TDqB4(&Dg~?#zr8OO6~!eRfr1){+|xA!n3k
zZE>90*y!G2c%snRh?#l)#0}TJu&;CwR95yg6lhj7=u!0LIq`tw%DwLaMx{*5(+e)G
zQjJ~3-N1J4#T-M|(9Xt#JSo$I6t0w|YR)iT#=x+RNBZG()>KUfkWXCwT-G@yGywoa
C!Bj#3

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mcl_minecarts/textures/rail_detector.png b/mods/ENTITIES/mcl_minecarts/textures/rail_detector.png
index d4548bc21dcd9f7aa4d627a0626888caf20fa502..88eef9f6de762c4223252ff674c4350833c92f4e 100644
GIT binary patch
delta 255
zcmV<b009520-FMmB!53pOjJcNF)m3-Nh~ZZJv}{qUrcdUM2Tuno_Sy+BO^66HDXIU
zcXV@(jEIDRf;bWqZEk97U|CEY93~75Sx!eyK{_lYL@)pV00DGTPE!Ct=GbNc004?f
zL_t(|0acF$0>mH?1H%dq)&IZs(w?Wq1{(kb!7CDgf1qGY#du@7;<-412dPrcS><8`
zF>u8d^Q;w&3R>@djMt%4Gy2lj^$oU?=V&DTb<18d#u&Z70gB*Q*Y!9d1&o#3Bbw18
z5>%C(v&ijH37n=Dtx$wwpSN%kE5!}+1$JTyUm&GC!2@LQ1ez;6XW9S&002ovPDHLk
FV1k}bV!{9b

delta 256
zcmV+b0ssD+0;~d%Bnkm@Qb$4nuFf3kks%a+aaKe%H8mq6Bc6F+iE2)KUrb_4JA{FP
zj*N(RbaQK9S#54=I1&;}92_PL3{62gSx!fsOsnPq0004WQchC<K<3zH0001vNkl<Z
z7}HIUQ4Rwk2t;uND(c$pcJF`Ig4(ov49N>H0}&<AE~MH1Kn}GGE{`ZyVF#R0QH@<|
zRLnt1J`rWCxyDWg9liI~_R%vd_2)6h7raEzb~x$V<r1aVnlEiY0=mZ-_nROyhs+$s
z+(n9mnxU$|%n`QiNv)W8kQHqG;zKU$Xwm=|e%}Uw$O0c;8U%T$=g)Bf0000<MNUMn
GLSTY!{b$Pn

diff --git a/mods/ENTITIES/mcl_minecarts/textures/rail_detector_powered.png b/mods/ENTITIES/mcl_minecarts/textures/rail_detector_powered.png
index 07369867b7fc4f0436958b29bd9d9f20563cf0b2..ae1083d20879687b866f2b0144dc52a5cb7addeb 100644
GIT binary patch
delta 249
zcmV<V00#f70+j-gB!4_mOjJex|NluzNh~ZZJv}{qUrcdUM2Tuno_Sy+BO^66HDXIU
zf(;FKbaRf3h=hTHmjeT60s?JrYHMIwZ~_8pjryGc0004WQchC<K<3zH0001oNkl<Z
zcmZ9{hXR8j3<S{ZCb;$g|Fs9*J@-@LAR-oeMwsXqw4Y7I<8s#HSq^ZPCe0kDECU4N
ziyrgTMu`3mI%(3pEX%q+VXNGiV?Iy7nB}UZb%rcYpb}cwby)yKh}Gy3X6O-srjnT=
zqelZcnp#*z7>d2uf{$=g8ju|}u<#o&K|SCOFkJ*l!m!=P00000NkvXXu0mjf(b{E}

delta 272
zcmV+r0q_2m0;>X$B!2;OQb$4nuFf3k0000&P)t-s|Ns9<Nl7d$EImCvaaKe%H8mq6
zBc6F+iE2)KUrb_4J5514gn@#NjEHx1bAk;GYhYPzZfa-(0+#~=Z~_7`F)qQCq^bY_
z00DGTPE!Ct=GbNc004?fL_t&-(_N2I4#O}ALx}?{M5Jri-GBeAgCx?X@nNJVz=ntl
zXcx+CKcJ>s1-C~Qt8f4==;+2FDi)xXn8-5L+H<G=9eq}%V~pXx!7ch4*KwY{UEZSP
zN06}r3CP`Ji6AqF%pA?aMOuJfp{l^lk+vL3t(ioS6>R+yLm}&E(F8ZX-zI>_0v|CE
W1UKGzd1(Lu00{s|MNUMnLSTX&T5Vkb

diff --git a/mods/ENTITIES/mcl_minecarts/textures/rail_golden_powered.png b/mods/ENTITIES/mcl_minecarts/textures/rail_golden_powered.png
deleted file mode 100644
index 9d7b9d58a006e57ec97403a0ea422857951607b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 281
zcmV+!0p|XRP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00001b5ch_0Itp)
z=>Px#IZ#YgMNL6ENl8g8EG#`eJ#kh<H8nLOBO{)9V2Nr@d|ymrOFPu3HR{1)BO@b%
z4Gm}l0+#~=Z~_7`F)kU3hXMcq00DGTPE!Ct=GbNc004nWL_t&-(`}Dg4#O}A1=&mu
zwz}N^vVD+5m7=~6BaHwLM8ra8guCbs*l>GPrilhX3{Oc5Ji-Q$>MLet3D25g*~f}4
zTII>Ih#C8~H+ZY8mshrr0w2YQs#Zq>8rO~`4d%cvG2sDF9@!q51`o|c3>xSOm|EZB
fx8r`-`akdm=Qsm<8^m?O00000NkvXXu0mjfGv8md