From daec0eacfa45459c0e991cf2660b67d229bae9b5 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Thu, 24 Oct 2013 18:59:04 +0100 Subject: [PATCH] Pull in wooden rails from Chaotic Bastion. --- resources/assets/tinker/lang/en_US.lang | 2 + .../tinker/textures/blocks/woodrail.png | Bin 0 -> 431 bytes .../tinker/textures/blocks/woodrail_turn.png | Bin 0 -> 476 bytes src/tconstruct/blocks/WoodRail.java | 59 ++++++++++++++++++ src/tconstruct/common/TContent.java | 7 +++ src/tconstruct/util/config/PHConstruct.java | 3 + 6 files changed, 71 insertions(+) create mode 100644 resources/assets/tinker/textures/blocks/woodrail.png create mode 100644 resources/assets/tinker/textures/blocks/woodrail_turn.png create mode 100644 src/tconstruct/blocks/WoodRail.java diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index e3e01a5a..bf96c4a7 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -96,6 +96,8 @@ block.fancybrick.obsidian.ingot.name=Fancy Obsidian Brick block.fancybrick.stone.road.name=Stone Road block.fancybrick.stone.name=Fancy Stone Brick +block.rail.wood=Wooden Rail + tile.cloth.white.slab.name=Wool Slab tile.cloth.orange.slab.name=Orange Wool Slab tile.cloth.magenta.slab.name=Magenta Wool Slab diff --git a/resources/assets/tinker/textures/blocks/woodrail.png b/resources/assets/tinker/textures/blocks/woodrail.png new file mode 100644 index 0000000000000000000000000000000000000000..13d2932b5ba5eac38180f4e23f1219873fe39027 GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)CySt#Oj`$MI0FNtji-xah{fr%ll;98F-RP%=RWIu zL1mVL(-9S$CyoOBj_Lh(ZOgw2r^qkfoxb0}L-v(W2}h8L?2;$*cS>BkG0i8ky-1-^ zPUnTC{rle^{!~1Oo?3KJTlBMBc8J!qyKQGzr@;T;t|W8Q+lknSnl5=$i&b;S8!zuQ$w1?jc@GFc5j_xV-&MSGv%_Om^lMu zL)Kc&Ida-^2d>6?M}#WQ{ERVwjVi2v+4~+Z;@kR_XWjeT|63e0Zbup&Qx42~ee9R4j>H>}(>ziVCHJ4D zOnH&UV{|Is_=38gJNu^n&9#<%4*v3=@62ACe&M=~nsE0)g`UJ)CMt*hgWKP|fB!)E Xfz(NJ^WN*Apk?rM^>bP0l+XkKs?w;G literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/blocks/woodrail_turn.png b/resources/assets/tinker/textures/blocks/woodrail_turn.png new file mode 100644 index 0000000000000000000000000000000000000000..ba8416d754dcd235fffa09c1098d2d952fd51097 GIT binary patch literal 476 zcmV<20VDp2P)#LaK;_aV03c4wdi&rYrzbe@?4nKppqSU_)_M$;@7X{CKbQeo zsY@Yv-7!oEB4FTG_Y;#_FIO9+?R0ow2+GWqqe36OzVwR(0CyqGT41@_AdjtQcwG^e zY0#h= 6 ? this.theIcon : this.blockIcon; + } + + @SideOnly(Side.CLIENT) + + /** + * When this method is called, your block should register all the icons it needs with the given IconRegister. This + * is the only chance you get to register icons. + */ + public void registerIcons(IconRegister par1IconRegister) + { + this.blockIcon = par1IconRegister.registerIcon("tinker:woodrail"); + this.theIcon = par1IconRegister.registerIcon("tinker:woodrail_turn"); + } + + protected void func_94358_a(World par1World, int par2, int par3, int par4, int par5, int par6, int par7) + { + if (par7 > 0 && Block.blocksList[par7].canProvidePower() && (new BlockBaseRailLogic(this, par1World, par2, par3, par4)).getNumberOfAdjacentTracks() == 3) + { + this.refreshTrackShape(par1World, par2, par3, par4, false); + } + } + + @Override + public float getRailMaxSpeed(World world, EntityMinecart cart, int y, int x, int z) + { + return 0.3f; + } + +} diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index db852194..56b74992 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -269,6 +269,9 @@ public class TContent implements IFuelHandler public static Item heartCanister; public static Item goldHead; + //Rail-related + public static Block woodenRail; + //Chest hooks public static ChestGenHooks tinkerHouseChest; public static ChestGenHooks tinkerHousePatterns; @@ -797,6 +800,10 @@ public class TContent implements IFuelHandler essenceExtractor = new EssenceExtractor(PHConstruct.essenceExtractor).setHardness(12f).setUnlocalizedName("extractor.essence"); GameRegistry.registerBlock(essenceExtractor, "extractor.essence"); GameRegistry.registerTileEntity(EssenceExtractorLogic.class, "extractor.essence"); + + //Rail + woodenRail = new WoodRail(PHConstruct.woodenRail).setStepSound(Block.soundWoodFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("rail.wood"); + GameRegistry.registerBlock(woodenRail, "rail.wood"); } void registerItems () diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index bf2cf0c4..696ddb76 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -179,6 +179,7 @@ public class PHConstruct woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); airTank = config.getBlock("Air Tank", 3246).getInt(3246); castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); + woodenRail = config.getBlock("Wooden Rail", 3250).getInt(3250); manual = config.getItem("Patterns and Misc", "Tinker's Manual", 14018).getInt(14018); blankPattern = config.getItem("Patterns and Misc", "Blank Patterns", 14019).getInt(14019); @@ -409,6 +410,8 @@ public class PHConstruct public static int redstoneMachine; public static int dryingRack; + public static int woodenRail; + //Crops public static int oreBerry; public static int oreBerrySecond;