diff --git a/src/main/java/train/client/core/ClientProxy.java b/src/main/java/train/client/core/ClientProxy.java index a9dfc5c7e..b7517520d 100644 --- a/src/main/java/train/client/core/ClientProxy.java +++ b/src/main/java/train/client/core/ClientProxy.java @@ -37,6 +37,7 @@ import train.common.adminbook.GUIAdminBook; import train.common.api.EntityBogie; import train.common.api.EntityRollingStock; +import train.common.blocks.TCBlocks; import train.common.core.CommonProxy; import train.common.core.Traincraft_EventSounds; import train.common.core.handlers.ConfigHandler; @@ -183,13 +184,13 @@ public void registerRenderInformation() { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockIDs.signal.block), new ItemRenderSignal()); ClientRegistry.bindTileEntitySpecialRenderer(TileLantern.class, new RenderLantern()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockIDs.lantern.block), new ItemRenderLantern()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TCBlocks.lantern), new ItemRenderLantern()); ClientRegistry.bindTileEntitySpecialRenderer(TileSwitchStand.class, new RenderSwitchStand()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockIDs.switchStand.block), new ItemRenderSwitchStand()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TCBlocks.switchStand), new ItemRenderSwitchStand()); ClientRegistry.bindTileEntitySpecialRenderer(TileMFPBWigWag.class, new RenderMFPBWigWag()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockIDs.MFPBWigWag.block), new ItemRenderMFPBWigWag()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TCBlocks.MFPBWigWag), new ItemRenderMFPBWigWag()); ClientRegistry.bindTileEntitySpecialRenderer(TileWaterWheel.class, new RenderWaterWheel()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockIDs.waterWheel.block), new ItemRenderWaterWheel()); diff --git a/src/main/java/train/client/core/handlers/RecipeBookHandler.java b/src/main/java/train/client/core/handlers/RecipeBookHandler.java index ff829da61..8d7b5f8d0 100644 --- a/src/main/java/train/client/core/handlers/RecipeBookHandler.java +++ b/src/main/java/train/client/core/handlers/RecipeBookHandler.java @@ -31,14 +31,14 @@ public RecipeBookHandler() { vanillaWorkTableRecipes[7] = ItemIDs.jacket.item.getUnlocalizedName(); vanillaWorkTableRecipes[8] = ItemIDs.hat.item.getUnlocalizedName(); vanillaWorkTableRecipes[11] = ItemIDs.recipeBook.item.getUnlocalizedName(); - vanillaWorkTableRecipes[12] = BlockIDs.lantern.block.getUnlocalizedName(); + vanillaWorkTableRecipes[12] = TCBlocks.lantern.getUnlocalizedName(); vanillaWorkTableRecipes[14] = ItemIDs.pants_driver_paintable.item.getUnlocalizedName(); vanillaWorkTableRecipes[15] = ItemIDs.pants_ticketMan_paintable.item.getUnlocalizedName(); vanillaWorkTableRecipes[16] = ItemIDs.hat_driver_paintable.item.getUnlocalizedName(); vanillaWorkTableRecipes[17] = ItemIDs.hat_ticketMan_paintable.item.getUnlocalizedName(); vanillaWorkTableRecipes[18] = ItemIDs.jacket_driver_paintable.item.getUnlocalizedName(); vanillaWorkTableRecipes[19] = ItemIDs.jacket_ticketMan_paintable.item.getUnlocalizedName(); - vanillaWorkTableRecipes[20] = BlockIDs.switchStand.block.getUnlocalizedName(); + vanillaWorkTableRecipes[20] = TCBlocks.switchStand.getUnlocalizedName(); } // TODO: Make parameters more specific than List diff --git a/src/main/java/train/common/blocks/BlockBridgePillar.java b/src/main/java/train/common/blocks/BlockBridgePillar.java index 2967a0bf3..a55df7cf7 100644 --- a/src/main/java/train/common/blocks/BlockBridgePillar.java +++ b/src/main/java/train/common/blocks/BlockBridgePillar.java @@ -66,15 +66,6 @@ public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int - - - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } - @Override public IIcon getIcon(int i, int j) { return texture; diff --git a/src/main/java/train/common/blocks/BlockLantern.java b/src/main/java/train/common/blocks/BlockLantern.java index f4e4b6651..af6ce894e 100644 --- a/src/main/java/train/common/blocks/BlockLantern.java +++ b/src/main/java/train/common/blocks/BlockLantern.java @@ -10,6 +10,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import train.common.Traincraft; +import train.common.api.blocks.BlockDynamic; import train.common.items.ItemWrench; import train.common.library.GuiIDs; import train.common.library.Info; @@ -17,17 +18,18 @@ import java.util.Random; -public class BlockLantern extends Block { +public class BlockLantern extends BlockDynamic { private IIcon texture; public BlockLantern() { - super(Material.rock); - setCreativeTab(Traincraft.tcTab); + super(Material.rock,0); this.setTickRandomly(true); - float f = 0.3F; - this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 3.0F, 0.5F + f); + setLightLevel(0.98F); } + @Override + public float[] hitboxShape(){return new float[]{0.3f,0,0.3f,0.7f,0.9f,0.7f};} + @Override public boolean hasTileEntity(int metadata) { return true; @@ -47,6 +49,10 @@ public boolean isOpaqueCube() { public TileEntity createTileEntity(World world, int metadata) { return new TileLantern(); } + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileLantern(); + } @Override public int getRenderType() { @@ -59,12 +65,9 @@ public int getRenderType() { */ @Override public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - double d0 = (double) ((float) par2 + 0.5F); - double d2 = (double) ((float) par4 + 0.5F); - double d3 = 0.2199999988079071D; - par1World.spawnParticle("smoke", d0, par3 + d3, d2, 0.0D, 0.0D, 0.0D); - par1World.spawnParticle("flame", d0, par3 + d3, d2, 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("smoke", par2 + 0.5F, par3 + 0.2199999988079071D, par4 + 0.5F, 0.0D, 0.0D, 0.0D); + par1World.spawnParticle("flame", par2 + 0.5F, par3 + 0.2199999988079071D, par4 + 0.5F, 0.0D, 0.0D, 0.0D); } @Override @@ -74,7 +77,7 @@ public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer p return false; } if(player!=null && player.getCurrentEquippedItem()!=null && player.getCurrentEquippedItem().getItem() instanceof ItemWrench) - if (te != null && te instanceof TileLantern) { + if (te instanceof TileLantern) { player.openGui(Traincraft.instance, GuiIDs.LANTERN, world, i, j, k); } return true; diff --git a/src/main/java/train/common/blocks/BlockMFPBWigWag.java b/src/main/java/train/common/blocks/BlockMFPBWigWag.java index 8947fe52e..6803d50eb 100644 --- a/src/main/java/train/common/blocks/BlockMFPBWigWag.java +++ b/src/main/java/train/common/blocks/BlockMFPBWigWag.java @@ -15,26 +15,23 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import train.common.Traincraft; +import train.common.api.blocks.BlockDynamic; import train.common.library.Info; import train.common.tile.TileMFPBWigWag; import java.util.List; import java.util.Random; -public class BlockMFPBWigWag extends Block { - private IIcon texture; +public class BlockMFPBWigWag extends BlockDynamic { public BlockMFPBWigWag() { - super(Material.rock); + super(Material.rock,0); setCreativeTab(Traincraft.tcTab); this.setTickRandomly(true); - //this.setBlockBounds(0.5F , 0.0F, 0.5F , 0.5F , 2.0F, 0.5F); } @Override - public void addCollisionBoxesToList(World p_149743_1_, int p_149743_2_, int p_149743_3_, int p_149743_4_, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) - { - } + public float[] hitboxShape(){return new float[]{0,0,0,1,2,1};} @Override public boolean hasTileEntity(int metadata) { @@ -61,14 +58,6 @@ public int getRenderType() { return -1; } - @SideOnly(Side.CLIENT) - /** - * A randomly called display update to be able to add particles or other items for display - */ - @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - - } @Override @@ -81,15 +70,4 @@ public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase e world.markBlockForUpdate(i, j, k); } } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } - - @Override - public IIcon getIcon(int i, int j) { - return texture; - } } diff --git a/src/main/java/train/common/blocks/BlockMetroMadridPole.java b/src/main/java/train/common/blocks/BlockMetroMadridPole.java index 78b7dfe9a..b311e6677 100644 --- a/src/main/java/train/common/blocks/BlockMetroMadridPole.java +++ b/src/main/java/train/common/blocks/BlockMetroMadridPole.java @@ -88,11 +88,7 @@ public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } + @Override public IIcon getIcon(int i, int j) { diff --git a/src/main/java/train/common/blocks/BlockSwitchStand.java b/src/main/java/train/common/blocks/BlockSwitchStand.java index 1ea72e6ab..ea55fd5cd 100644 --- a/src/main/java/train/common/blocks/BlockSwitchStand.java +++ b/src/main/java/train/common/blocks/BlockSwitchStand.java @@ -3,6 +3,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockLever; +import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -14,26 +15,25 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import train.common.Traincraft; +import train.common.api.blocks.BlockDynamic; +import train.common.api.blocks.BlockSwitch; import train.common.library.Info; import train.common.tile.TileSwitchStand; import java.util.List; import java.util.Random; -public class BlockSwitchStand extends BlockLever { - private IIcon texture; +public class BlockSwitchStand extends BlockSwitch { public BlockSwitchStand() { - super(); + super(Material.wood, 0); setCreativeTab(Traincraft.tcTab); this.setTickRandomly(true); - //this.setBlockBounds(0.5F , 0.0F, 0.5F , 0.5F , 2.0F, 0.5F); } @Override - public void addCollisionBoxesToList(World p_149743_1_, int p_149743_2_, int p_149743_3_, int p_149743_4_, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) - { - } + public float[] hitboxShape(){return new float[]{0,0,0,1,2,1};} + @Override public boolean hasTileEntity(int metadata) { @@ -54,6 +54,10 @@ public boolean isOpaqueCube() { public TileEntity createTileEntity(World world, int metadata) { return new TileSwitchStand(); } + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileSwitchStand(); + } @Override public int getRenderType() { @@ -61,13 +65,7 @@ public int getRenderType() { } @SideOnly(Side.CLIENT) - /** - * A randomly called display update to be able to add particles or other items for display - */ - @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - } @Override @@ -89,14 +87,4 @@ public boolean canProvidePower() return true; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } - - @Override - public IIcon getIcon(int i, int j) { - return texture; - } } diff --git a/src/main/java/train/common/blocks/TCBlocks.java b/src/main/java/train/common/blocks/TCBlocks.java index b0628883d..81e558765 100644 --- a/src/main/java/train/common/blocks/TCBlocks.java +++ b/src/main/java/train/common/blocks/TCBlocks.java @@ -38,6 +38,9 @@ public static void init() { public static Block assemblyTableII=new BlockAssemblyTableII(Material.rock).setHardness(3.5F).setStepSound(Block.soundTypeWood); public static Block assemblyTableIII=new BlockAssemblyTableIII(Material.rock).setHardness(3.5F).setStepSound(Block.soundTypeWood); public static Block trainWorkbench=new BlockTrainWorkbench(16).setHardness(1.7F).setStepSound(Block.soundTypeWood); + public static Block lantern=new BlockLantern().setHardness(1.7F).setStepSound(Block.soundTypeMetal); + public static Block switchStand=new BlockSwitchStand().setHardness(1.7F).setStepSound(Block.soundTypeMetal); + public static Block MFPBWigWag=new BlockMFPBWigWag().setHardness(2.5F).setStepSound(Block.soundTypeMetal); public static void loadBlocks() { TraincraftRegistry.registerBlock(bridgePillar,Traincraft.tcTab, Info.modID,"bridgePillar"); @@ -49,13 +52,12 @@ public static void loadBlocks() { TraincraftRegistry.registerBlock(trainWorkbench,Traincraft.tcTab, Info.modID,"trainWorkbench"); TraincraftRegistry.registerBlock(openFurnaceIdle,Traincraft.tcTab, Info.modID,"openFurnaceIdle"); TraincraftRegistry.registerBlock(openFurnaceActive,null, Info.modID,"openFurnaceActive"); + TraincraftRegistry.registerBlock(lantern,Traincraft.tcTab, Info.modID,"lantern"); + TraincraftRegistry.registerBlock(switchStand,Traincraft.tcTab, Info.modID,"switchStand"); + TraincraftRegistry.registerBlock(MFPBWigWag,Traincraft.tcTab, Info.modID,"MFPBWigWag"); - - BlockIDs.lantern.block = new BlockLantern().setHardness(1.7F).setStepSound(Block.soundTypeMetal).setLightLevel(0.98F); - BlockIDs.switchStand.block = new BlockSwitchStand().setHardness(1.7F).setStepSound(Block.soundTypeMetal); - BlockIDs.MFPBWigWag.block = new BlockMFPBWigWag().setHardness(2.5F).setStepSound(Block.soundTypeMetal); BlockIDs.waterWheel.block = new BlockWaterWheel().setHardness(1.7F).setStepSound(Block.soundTypeWood); BlockIDs.windMill.block = new BlockWindMill().setHardness(1.7F).setStepSound(Block.soundTypeWood); BlockIDs.generatorDiesel.block = new BlockGeneratorDiesel().setHardness(1.7F).setStepSound(Block.soundTypeMetal); diff --git a/src/main/java/train/common/blocks/blockSwitch/BlockMILWSwitchStand.java b/src/main/java/train/common/blocks/blockSwitch/BlockMILWSwitchStand.java index 7bc55c48b..d79a2b41a 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlockMILWSwitchStand.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlockMILWSwitchStand.java @@ -89,12 +89,6 @@ public boolean canProvidePower() return true; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } - @Override public IIcon getIcon(int i, int j) { return texture; diff --git a/src/main/java/train/common/blocks/blockSwitch/BlockSpeedSign.java b/src/main/java/train/common/blocks/blockSwitch/BlockSpeedSign.java index cf67fca16..2569f583c 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlockSpeedSign.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlockSpeedSign.java @@ -122,12 +122,6 @@ public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } - @Override public IIcon getIcon(int i, int j) { return texture; diff --git a/src/main/java/train/common/blocks/blockSwitch/BlockautoSwitchStand.java b/src/main/java/train/common/blocks/blockSwitch/BlockautoSwitchStand.java index a0ffeaf87..68a45709d 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlockautoSwitchStand.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlockautoSwitchStand.java @@ -89,11 +89,7 @@ public boolean canProvidePower() return true; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } + @Override public IIcon getIcon(int i, int j) { diff --git a/src/main/java/train/common/blocks/blockSwitch/BlockcircleSwitchStand.java b/src/main/java/train/common/blocks/blockSwitch/BlockcircleSwitchStand.java index cd32fa0f0..c356149da 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlockcircleSwitchStand.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlockcircleSwitchStand.java @@ -89,11 +89,7 @@ public boolean canProvidePower() return true; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } + @Override public IIcon getIcon(int i, int j) { diff --git a/src/main/java/train/common/blocks/blockSwitch/BlockkSignal.java b/src/main/java/train/common/blocks/blockSwitch/BlockkSignal.java index d0e7640bc..7d28b1549 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlockkSignal.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlockkSignal.java @@ -221,11 +221,7 @@ public void updateTick(World world, int i, int j, int k) { * Can this block provide power. Only wire currently seems to have this change based on its state. */ - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } + @Override public IIcon getIcon(int i, int j) { diff --git a/src/main/java/train/common/blocks/blockSwitch/BlockoverheadWire.java b/src/main/java/train/common/blocks/blockSwitch/BlockoverheadWire.java index 2b228ab9a..146cc9d41 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlockoverheadWire.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlockoverheadWire.java @@ -195,11 +195,7 @@ public int isProvidingStrongPower(IBlockAccess p_149748_1_, int p_149748_2_, int * Can this block provide power. Only wire currently seems to have this change based on its state. */ - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } + @Override public IIcon getIcon(int i, int j) { diff --git a/src/main/java/train/common/blocks/blockSwitch/BlockoverheadWireDouble.java b/src/main/java/train/common/blocks/blockSwitch/BlockoverheadWireDouble.java index 5691de7bf..7d79a9260 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlockoverheadWireDouble.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlockoverheadWireDouble.java @@ -128,11 +128,7 @@ else if (i1 != 5 && i1 != 6) * Can this block provide power. Only wire currently seems to have this change based on its state. */ - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } + @Override public IIcon getIcon(int i, int j) { diff --git a/src/main/java/train/common/blocks/blockSwitch/BlockowoSwitchStand.java b/src/main/java/train/common/blocks/blockSwitch/BlockowoSwitchStand.java index 5667a5cff..86f788b94 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlockowoSwitchStand.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlockowoSwitchStand.java @@ -89,11 +89,7 @@ public boolean canProvidePower() return true; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } + @Override public IIcon getIcon(int i, int j) { diff --git a/src/main/java/train/common/blocks/blockSwitch/BlockowoYardSwitchStand.java b/src/main/java/train/common/blocks/blockSwitch/BlockowoYardSwitchStand.java index 7e1edcbd2..5704be040 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlockowoYardSwitchStand.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlockowoYardSwitchStand.java @@ -89,11 +89,7 @@ public boolean canProvidePower() return true; } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } + @Override public IIcon getIcon(int i, int j) { diff --git a/src/main/java/train/common/blocks/blockSwitch/BlocksignalSpanish.java b/src/main/java/train/common/blocks/blockSwitch/BlocksignalSpanish.java index 5eeedc9d2..685e6bc32 100644 --- a/src/main/java/train/common/blocks/blockSwitch/BlocksignalSpanish.java +++ b/src/main/java/train/common/blocks/blockSwitch/BlocksignalSpanish.java @@ -220,11 +220,7 @@ public void updateTick(World world, int i, int j, int k) { * Can this block provide power. Only wire currently seems to have this change based on its state. */ - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - texture = iconRegister.registerIcon(Info.modID.toLowerCase() + ":assembly_1_bottom"); - } + @Override public IIcon getIcon(int i, int j) { diff --git a/src/main/java/train/common/core/handlers/RecipeHandler.java b/src/main/java/train/common/core/handlers/RecipeHandler.java index 1651e6da5..c70c96dfa 100644 --- a/src/main/java/train/common/core/handlers/RecipeHandler.java +++ b/src/main/java/train/common/core/handlers/RecipeHandler.java @@ -64,7 +64,7 @@ public static void initBlockRecipes() { /* Lantern */ for (ItemStack ironingot : iron) { - GameRegistry.addRecipe(new ItemStack(BlockIDs.lantern.block, 4), "III", "PTP", "III", 'I', ironingot, 'P', Blocks.glass_pane, 'T', Blocks.torch); + GameRegistry.addRecipe(new ItemStack(TCBlocks.lantern, 4), "III", "PTP", "III", 'I', ironingot, 'P', Blocks.glass_pane, 'T', Blocks.torch); } /* Clothes */ @@ -278,9 +278,9 @@ public static void initBlockRecipes() { GameRegistry.addShapelessRecipe(new ItemStack(BlockIDs.dirtierBallast.block, 16), new ItemStack(BlockIDs.dirtyBallast.block, 1), new ItemStack(BlockIDs.dirtyBallast.block, 1), new ItemStack(BlockIDs.dirtyBallast.block, 1), new ItemStack(BlockIDs.dirtyBallast.block, 1), new ItemStack(BlockIDs.dirtyBallast.block, 1), new ItemStack(BlockIDs.dirtyBallast.block, 1), new ItemStack(BlockIDs.dirtyBallast.block, 1), new ItemStack(BlockIDs.dirtyBallast.block, 1), Blocks.dirt); for (ItemStack ironingot : iron) { - addDictRecipe(new ItemStack(BlockIDs.switchStand.block, 1), " W ", " I ", " R ", 'W', Blocks.lever, 'R', Items.stick, 'I', ironingot); + addDictRecipe(new ItemStack(TCBlocks.switchStand, 1), " W ", " I ", " R ", 'W', Blocks.lever, 'R', Items.stick, 'I', ironingot); addDictRecipe(new ItemStack(BlockIDs.MILWSwitchStand.block, 1), " RW", "BWR", "AAA", 'A', new ItemStack(Items.stick), 'B', Blocks.iron_bars, 'R', new ItemStack(Items.dye, 1, 1), 'W', new ItemStack(Items.dye, 1, 15)); - addDictRecipe(new ItemStack(BlockIDs.MFPBWigWag.block, 1), "IWI", " I ", " I ", 'W', Blocks.lever, 'I', ironingot); + addDictRecipe(new ItemStack(TCBlocks.MFPBWigWag, 1), "IWI", " I ", " I ", 'W', Blocks.lever, 'I', ironingot); /*Buffer*/ addDictRecipe(new ItemStack(BlockIDs.stopper.block, 1), "WWW", "I I", "RRR", 'W', "plankWood", 'R', Blocks.rail, 'I', ironingot); addDictRecipe(new ItemStack(BlockIDs.embeddedStopper.block, 1), " ", "I I", "RRR", 'R', Blocks.rail, 'I', ironingot); @@ -343,7 +343,7 @@ public static void initItemRecipes() { /* Lantern */ for (ItemStack ironingot : iron) { - TrainCraftingManager.instance.addRecipe(new ItemStack(BlockIDs.lantern.block, 4), "III", "PTP", "III", 'I', ironingot, 'P', Blocks.glass_pane, 'T', Blocks.torch); + TrainCraftingManager.instance.addRecipe(new ItemStack(TCBlocks.lantern, 4), "III", "PTP", "III", 'I', ironingot, 'P', Blocks.glass_pane, 'T', Blocks.torch); } /* Clothes */ TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.overalls.item, 1), " # ", "X$X", "X X", 'X', new ItemStack(Items.dye, 1, 4), '$', Items.leather_leggings, '#', new ItemStack(Items.dye, 1, 1)); @@ -483,8 +483,8 @@ public static void initItemRecipes() { TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.ironFrame.item, 2), " ", "# #", "AAA", 'A', ironingot, '#', plankItem);// iron Frame TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.ironCab.item, 2), "###", "X X", "XXX", 'X', ironingot, '#', plankItem);// iron cab TrainCraftingManager.instance.addRecipe(new ItemStack(BlockIDs.stopper.block, 1), "WWW", "I I", "RRR", 'W', plankItem, 'R', Blocks.rail, 'I', ironingot);// stopper - TrainCraftingManager.instance.addRecipe(new ItemStack(BlockIDs.switchStand.block, 1), " W ", " I ", " R ", 'W', Blocks.lever, 'R', Items.stick, 'I', ironingot);//switchstand - TrainCraftingManager.instance.addRecipe(new ItemStack(BlockIDs.MFPBWigWag.block, 1), "IWI", " I ", " I ", 'W', Blocks.lever, 'I', ironingot);//wigwag + TrainCraftingManager.instance.addRecipe(new ItemStack(TCBlocks.switchStand, 1), " W ", " I ", " R ", 'W', Blocks.lever, 'R', Items.stick, 'I', ironingot);//switchstand + TrainCraftingManager.instance.addRecipe(new ItemStack(TCBlocks.MFPBWigWag, 1), "IWI", " I ", " I ", 'W', Blocks.lever, 'I', ironingot);//wigwag } // Short Wood Slope TrainCraftingManager.instance.addRecipe(new ItemStack(ItemIDs.tcRailSlopeWood.item, 1), diff --git a/src/main/java/train/common/generation/ComponentVillageTrainstation.java b/src/main/java/train/common/generation/ComponentVillageTrainstation.java index 2d2b3ae81..b4df66582 100644 --- a/src/main/java/train/common/generation/ComponentVillageTrainstation.java +++ b/src/main/java/train/common/generation/ComponentVillageTrainstation.java @@ -109,9 +109,9 @@ public boolean addComponentParts(World world, Random random, StructureBoundingBo this.fillWithBlocks(world, structureboundingbox, 1, 4, 6, 7, 4, 6, Blocks.wooden_slab, Blocks.wooden_slab, false); this.fillWithBlocks(world, structureboundingbox, 1, 4, 8, 7, 4, 8, Blocks.wooden_slab, Blocks.wooden_slab, false); this.placeBlockAtCurrentPosition(world, Blocks.fence, 0, 0, 1, 6, structureboundingbox); - this.placeBlockAtCurrentPosition(world, BlockIDs.lantern.block, 0, 0, 2, 6, structureboundingbox); + this.placeBlockAtCurrentPosition(world, TCBlocks.lantern, 0, 0, 2, 6, structureboundingbox); this.placeBlockAtCurrentPosition(world, Blocks.fence, 0, 8, 1, 6, structureboundingbox); - this.placeBlockAtCurrentPosition(world, BlockIDs.lantern.block, 0, 8, 2, 6, structureboundingbox); + this.placeBlockAtCurrentPosition(world, TCBlocks.lantern, 0, 8, 2, 6, structureboundingbox); this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 5, 2, 5, structureboundingbox); this.placeBlockAtCurrentPosition(world, Blocks.glass_pane, 0, 6, 2, 5, structureboundingbox); @@ -120,8 +120,8 @@ public boolean addComponentParts(World world, Random random, StructureBoundingBo this.fillWithBlocks(world, structureboundingbox, 4, 3, 4, 7, 3, 4, Blocks.bookshelf, Blocks.bookshelf, false); this.fillWithBlocks(world, structureboundingbox, 5, 3, 5, 6, 3, 5, Blocks.glass_pane, Blocks.glass_pane, false); this.fillWithBlocks(world, structureboundingbox, 4, 3, 3, 7, 3, 3, Blocks.iron_bars, Blocks.iron_bars, false); - this.placeBlockAtCurrentPosition(world, BlockIDs.lantern.block, 0, 7, 4, 3, structureboundingbox); - this.placeBlockAtCurrentPosition(world, BlockIDs.lantern.block, 0, 4, 4, 3, structureboundingbox); + this.placeBlockAtCurrentPosition(world, TCBlocks.lantern, 0, 7, 4, 3, structureboundingbox); + this.placeBlockAtCurrentPosition(world, TCBlocks.lantern, 0, 4, 4, 3, structureboundingbox); this.placeBlockAtCurrentPosition(world, Blocks.iron_bars, 0, 4, 2, 3, structureboundingbox); this.fillWithBlocks(world, structureboundingbox, 4, 1, 3, 7, 1, 3, Blocks.iron_bars, Blocks.iron_bars, false); diff --git a/src/main/java/train/common/library/BlockIDs.java b/src/main/java/train/common/library/BlockIDs.java index 60958fc27..5e1c284a1 100644 --- a/src/main/java/train/common/library/BlockIDs.java +++ b/src/main/java/train/common/library/BlockIDs.java @@ -52,9 +52,6 @@ public enum BlockIDs { snowGravelStairs(false, null), asphaltStairs(false, null), - lantern(false, null), - switchStand(false, null), - MFPBWigWag(false, null), waterWheel(true, ItemBlockGeneratorWaterWheel.class), windMill(true, ItemBlockGeneratorWindMill.class), generatorDiesel(true, ItemBlockGeneratorDiesel.class), diff --git a/src/main/java/train/common/library/TraincraftRegistry.java b/src/main/java/train/common/library/TraincraftRegistry.java index acdf77bb1..182bef4dc 100644 --- a/src/main/java/train/common/library/TraincraftRegistry.java +++ b/src/main/java/train/common/library/TraincraftRegistry.java @@ -95,6 +95,11 @@ public TrainRecord getTrainRecord(Class entityClass) { return record; } } + for(TrainRecord fallback : EnumTrains.trains()){ + if (entityClass.equals(fallback.getEntityClass())) { + return fallback; + } + } return null; } @@ -353,7 +358,7 @@ public static Block registerBlock(Block block, CreativeTabs tab, String MODID, S if (oreDictionaryName != null) { OreDictionary.registerOre(oreDictionaryName, block); } - if (DebugUtil.dev && Traincraft.proxy.isClient() && block.getUnlocalizedName().equals(StatCollector.translateToLocal(block.getUnlocalizedName()))) { + if (DebugUtil.dev && Traincraft.proxy.isClient() && block.getUnlocalizedName().equals(StatCollector.translateToLocal(block.getUnlocalizedName() +".name"))) { DebugUtil.println("Block missing lang entry: " + block.getUnlocalizedName()); } if (block instanceof ITileEntityProvider) { @@ -411,7 +416,7 @@ public static Item RegisterItem(Item itm, String MODID, String unlocalizedName, if (oreDictionaryName != null) { OreDictionary.registerOre(oreDictionaryName, itm); } - if (DebugUtil.dev && Traincraft.proxy != null && Traincraft.proxy.isClient() && itm.getUnlocalizedName().equals(StatCollector.translateToLocal(itm.getUnlocalizedName()))) { + if (DebugUtil.dev && Traincraft.proxy != null && Traincraft.proxy.isClient() && itm.getUnlocalizedName().equals(StatCollector.translateToLocal(itm.getUnlocalizedName()+".name"))) { DebugUtil.println("Item missing lang entry: " + itm.getUnlocalizedName()); } if (Traincraft.proxy.isClient() && itemRender != null) { diff --git a/src/main/java/train/common/tile/TileMFPBWigWag.java b/src/main/java/train/common/tile/TileMFPBWigWag.java index d5f28370e..b3ced1adb 100644 --- a/src/main/java/train/common/tile/TileMFPBWigWag.java +++ b/src/main/java/train/common/tile/TileMFPBWigWag.java @@ -11,6 +11,7 @@ import net.minecraftforge.common.util.ForgeDirection; import train.common.api.blocks.TileSwitch; import train.common.api.blocks.TileTraincraft; +import train.common.blocks.TCBlocks; import train.common.library.BlockIDs; import train.common.library.Info; @@ -18,42 +19,21 @@ public class TileMFPBWigWag extends TileSwitch { - private int updateTicks = 0; - private static Random rand = new Random(); public float rotation =0; public boolean flip=true, powered =false; - // private net.minecraft.client.audio.ISound bell = new PositionedSound(new ResourceLocation(Info.modID,"bell")) - /* - @SideOnly(Side.CLIENT)//be sure sound is only created on client - private net.minecraft.client.audio.PositionedSound bell = new PositionedSound(new ResourceLocation(Info.modID,"bell")){ - - @Override - public float getXPosF() {return xCoord;} - @Override - public float getYPosF() {return yCoord+1;} - @Override - public float getZPosF() {return zCoord;} - - - }; - - */ - + @Override + public boolean canUpdate() + { + return true; + } @Override public void updateEntity() { super.updateEntity(); - updateTicks++; - if(worldObj.isRemote) { if (rotation > 20 || rotation < -20) { flip = !flip; - - - - //if(!Minecraft.getMinecraft().getSoundHandler().isSoundPlaying(bell)){ - //Minecraft.getMinecraft().getSoundHandler().playSound(bell); worldObj.playSound(xCoord,yCoord,zCoord,Info.resourceLocation + ":" + "bell",1f,1f,true); } @@ -64,32 +44,6 @@ public void updateEntity() { rotation = 0; } } - /** - * Remove any block on top of this wind mill - */ - else { - if (updateTicks % 20 == 0) { - if (!this.worldObj.isAirBlock(this.xCoord, this.yCoord + 1, this.zCoord)) { - Block block = this.worldObj.getBlock(this.xCoord, this.yCoord + 1, this.zCoord); - if (block != null) { - EntityItem entityitem = new EntityItem(worldObj, this.xCoord, this.yCoord + 1, this.zCoord, new ItemStack(Item.getItemFromBlock(BlockIDs.MFPBWigWag.block), 1)); - float f3 = 0.05F; - entityitem.motionX = (float) rand.nextGaussian() * f3; - entityitem.motionY = (float) rand.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float) rand.nextGaussian() * f3; - worldObj.spawnEntityInWorld(entityitem); - } - this.worldObj.setBlockToAir(this.xCoord, this.yCoord, this.zCoord); - } - } - } - } - - @SideOnly(Side.CLIENT) - @Override - public AxisAlignedBB getRenderBoundingBox() - { - return AxisAlignedBB.getBoundingBox(xCoord-1, yCoord-1, zCoord-1, xCoord + 2, yCoord + 2, zCoord + 2); } } \ No newline at end of file diff --git a/src/main/java/train/common/tile/TileSwitchStand.java b/src/main/java/train/common/tile/TileSwitchStand.java index 4f289bdd7..641bba7a3 100644 --- a/src/main/java/train/common/tile/TileSwitchStand.java +++ b/src/main/java/train/common/tile/TileSwitchStand.java @@ -11,6 +11,7 @@ import net.minecraftforge.common.util.ForgeDirection; import train.common.api.blocks.TileSwitch; import train.common.api.blocks.TileTraincraft; +import train.common.blocks.TCBlocks; import train.common.library.BlockIDs; import java.util.Random; @@ -32,7 +33,7 @@ public void updateEntity() { if (!this.worldObj.isAirBlock(this.xCoord, this.yCoord + 1, this.zCoord)) { Block block = this.worldObj.getBlock(this.xCoord, this.yCoord + 1, this.zCoord); if (block != null) { - EntityItem entityitem = new EntityItem(worldObj, this.xCoord, this.yCoord + 1, this.zCoord, new ItemStack(Item.getItemFromBlock(BlockIDs.switchStand.block), 1)); + EntityItem entityitem = new EntityItem(worldObj, this.xCoord, this.yCoord + 1, this.zCoord, new ItemStack(Item.getItemFromBlock(TCBlocks.switchStand), 1)); float f3 = 0.05F; entityitem.motionX = (float) rand.nextGaussian() * f3; entityitem.motionY = (float) rand.nextGaussian() * f3 + 0.2F; diff --git a/src/main/resources/assets/tc/lang/cs_CZ.lang b/src/main/resources/assets/tc/lang/cs_CZ.lang index 7e6fa6469..702919289 100644 --- a/src/main/resources/assets/tc/lang/cs_CZ.lang +++ b/src/main/resources/assets/tc/lang/cs_CZ.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Balast tile.tc:generatorDiesel.name=Dieselový generátor tile.tc:windMill.name=Větrný mlýn tile.tc:waterWheel.name=Vodní kolo -tile.tc:lantern.name=Lampa +tile.lantern.name=Lampa tile.openFurnaceActive.name=Žhavící pec (aktivní) tile.openFurnaceIdle.name=Žhavící pec tile.tc:stopper.name=Seřazovač vlaků @@ -25,7 +25,7 @@ tile.tc:tcRailGag.name=Kolej Trainu fluid.tc:fluid.diesel.name=Dieselové palivo fluid.tc:fluid.refinedfuel.name=Rafinované palivo tile.bridgePillar.name=Mostní pilíř -tile.tc:switchStand.name=Vysoká stojanová vyhýbka +tile.switchStand.name=Vysoká stojanová vyhýbka tile.mtcspeedtransmitter.name=MTC Rychlostní vysílač tile.mtcstatustransmitter.name=MTC Statový vysílač tile.mtcatostoppointtransmitter.name=MTC ATO Vysílač bodu zastavení diff --git a/src/main/resources/assets/tc/lang/da_DK.lang b/src/main/resources/assets/tc/lang/da_DK.lang index b5913f0f2..d53845bcb 100644 --- a/src/main/resources/assets/tc/lang/da_DK.lang +++ b/src/main/resources/assets/tc/lang/da_DK.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Skærver tile.tc:generatorDiesel.name=Diesel Generator tile.tc:windMill.name=Vindmølle tile.tc:waterWheel.name=Vandmølle -tile.tc:lantern.name=Lanterne +tile.lantern.name=Lanterne tile.openFurnaceActive.name=Brændeovn (aktiv) tile.openFurnaceIdle.name=Brændeovn tile.tc:stopper.name=Togstopper @@ -27,7 +27,7 @@ tile.tc:tcRailGag.name=Traincraft Skinne fluid.tc:fluid.diesel.name=Diesel Brændstof fluid.tc:fluid.refinedfuel.name=Rafineret Brændstof tile.bridgePillar.name=Bropille -tile.tc:switchStand.name=High Star Skiftehåndtag +tile.switchStand.name=High Star Skiftehåndtag tile.tc:mtcTransmitterSpeed.name=MTC Hastighedssender tile.tc:mtcTransmitterMTC.name=MTC Statussender tile.tc:mtcATOStopTransmitter.name=MTC ATO Stopområdesender @@ -1463,5 +1463,5 @@ key.traincraft.overspeedOverride=Hastighedsgrænse Tilsidesættelse key.traincraft.toggleATO=Justér ATO key.traincraft.bell=Klokke -tile.tc:MFPBWigWag.name=Wig Wag Krydsning +tile.MFPBWigWag.name=Wig Wag Krydsning tile.tc:speedSign.name=Hastighedsskilt \ No newline at end of file diff --git a/src/main/resources/assets/tc/lang/de_DE.lang b/src/main/resources/assets/tc/lang/de_DE.lang index 9c0ea1025..68acb989f 100644 --- a/src/main/resources/assets/tc/lang/de_DE.lang +++ b/src/main/resources/assets/tc/lang/de_DE.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Kies tile.tc:generatorDiesel.name=Dieselgenerator tile.tc:windMill.name=Windrad tile.tc:waterWheel.name=Wasserrad -tile.tc:lantern.name=Laterne +tile.lantern.name=Laterne tile.openFurnaceActive.name=Hochofen aktiv tile.openFurnaceIdle.name=Hochofen tile.tc:stopper.name=Prellbock diff --git a/src/main/resources/assets/tc/lang/en_US.lang b/src/main/resources/assets/tc/lang/en_US.lang index d3a5d3557..ddcba022e 100644 --- a/src/main/resources/assets/tc/lang/en_US.lang +++ b/src/main/resources/assets/tc/lang/en_US.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Ballast tile.tc:generatorDiesel.name=Diesel Generator tile.tc:windMill.name=Windmill tile.tc:waterWheel.name=Water Wheel -tile.tc:lantern.name=Lantern +tile.lantern.name=Lantern tile.openFurnaceActive.name=Hearth Furnace (active) tile.openFurnaceIdle.name=Hearth Furnace tile.tc:stopper.name=Train Buffer @@ -27,7 +27,7 @@ tile.tc:tcRailGag.name=Traincraft Rail fluid.tc:fluid.diesel.name=Diesel Fuel fluid.tc:fluid.refinedfuel.name=Refined Fuel tile.bridgePillar.name=Bridge Pillar -tile.tc:switchStand.name=High Star Switch Stand +tile.switchStand.name=High Star Switch Stand tile.tc:mtcTransmitterSpeed.name=MTC Speed Transmitter tile.tc:mtcTransmitterMTC.name=MTC Status Transmitter tile.tc:mtcATOStopTransmitter.name=MTC ATO Stop Point Transmitter @@ -1491,5 +1491,5 @@ key.traincraft.overspeedOverride=Overspeed Override key.traincraft.toggleATO=Toggle ATO key.traincraft.bell=Bell -tile.tc:MFPBWigWag.name=Wig Wag Crossing +tile.MFPBWigWag.name=Wig Wag Crossing tile.tc:speedSign.name=Speed Sign \ No newline at end of file diff --git a/src/main/resources/assets/tc/lang/es_ES.lang b/src/main/resources/assets/tc/lang/es_ES.lang index c2aa9f2df..be81fa0c3 100644 --- a/src/main/resources/assets/tc/lang/es_ES.lang +++ b/src/main/resources/assets/tc/lang/es_ES.lang @@ -9,7 +9,7 @@ tile.tc:oreTC.ballast.name=Balasto tile.tc:generatorDiesel.name=Generador diésel tile.tc:windMill.name=Aerogenerador tile.tc:waterWheel.name=Molino hidráulico -tile.tc:lantern.name=Lámpara +tile.lantern.name=Lámpara tile.openFurnaceActive.name=Alto horno (activo) tile.openFurnaceIdle.name=Alto horno tile.tc:stopper.name=Topera @@ -24,7 +24,7 @@ Traincraft tile.tc:tcRailGag.name=Vía Traincraft fluid.tc:fluid.diesel.name=Gasoil fluid.tc:fluid.refinedfuel.name=Fuel tile.bridgePillar.name=Pilar de puente -tile.tc:switchStand.name=Palanca de conmutador +tile.switchStand.name=Palanca de conmutador fluid.diesel.name=Gasoil diff --git a/src/main/resources/assets/tc/lang/fr_FR.lang b/src/main/resources/assets/tc/lang/fr_FR.lang index 12a5775b8..ddf99f729 100644 --- a/src/main/resources/assets/tc/lang/fr_FR.lang +++ b/src/main/resources/assets/tc/lang/fr_FR.lang @@ -9,7 +9,7 @@ tile.tc:oreTC.petroleum.name=Pétrole tile.tc:generatorDiesel.name=Générateur Diesel tile.tc:windMill.name=Moulin à vent tile.tc:waterWheel.name=Moulin à eau -tile.tc:lantern.name=Lanterne +tile.lantern.name=Lanterne tile.openFurnaceActive.name=Four Martin-Siemens actif tile.openFurnaceIdle.name=Four Martin-Siemens tile.tc:stopper.name=Heurtoir diff --git a/src/main/resources/assets/tc/lang/it_IT.lang b/src/main/resources/assets/tc/lang/it_IT.lang index 8cdcb5bfe..c95527608 100644 --- a/src/main/resources/assets/tc/lang/it_IT.lang +++ b/src/main/resources/assets/tc/lang/it_IT.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Massicciata tile.tc:generatorDiesel.name=generatore diesel tile.tc:windMill.name=Generatore Eolico tile.tc:waterWheel.name=Generatore Idroelettrico -tile.tc:lantern.name=Laterna +tile.lantern.name=Laterna tile.openFurnaceActive.name=Fornace aperta attiva tile.openFurnaceIdle.name=Fornace aperta tile.tc:stopper.name=Binario morto @@ -25,7 +25,7 @@ tile.tc:tcRailGag.name=Binario di Traincraft fluid.tc:fluid.diesel.name=Carburante diesel fluid.tc:fluid.refinedfuel.name=Carburante raffinato tile.bridgePillar.name=Pilone del ponte -tile.tc:switchStand.name=Supporto del deviatore a stella +tile.switchStand.name=Supporto del deviatore a stella fluid.diesel.name=Carburante diesel diff --git a/src/main/resources/assets/tc/lang/nl_NL.lang b/src/main/resources/assets/tc/lang/nl_NL.lang index e5b528170..dff3e2221 100644 --- a/src/main/resources/assets/tc/lang/nl_NL.lang +++ b/src/main/resources/assets/tc/lang/nl_NL.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Grind tile.tc:generatorDiesel.name=Diesel Generator tile.tc:windMill.name=Windmolen tile.tc:waterWheel.name=Water Wiel -tile.tc:lantern.name=Lantaarn +tile.lantern.name=Lantaarn tile.openFurnaceActive.name=Smelt Oven (Actief) tile.openFurnaceIdle.name=Smelt Oven tile.tc:stopper.name=Trein buffer @@ -25,7 +25,7 @@ tile.tc:tcRailGag.name=Traincraft Rails fluid.tc:fluid.diesel.name=Diesel Brandstof fluid.tc:fluid.refinedfuel.name=Gerafineerde Brandstof tile.bridgePillar.name=Brug Pilaar -tile.tc:switchStand.name=Hoge Ster Switch Stand +tile.switchStand.name=Hoge Ster Switch Stand fluid.diesel.name=Diesel Brandstof diff --git a/src/main/resources/assets/tc/lang/pl_PL.lang b/src/main/resources/assets/tc/lang/pl_PL.lang index d41f87c7e..c5a823fe3 100644 --- a/src/main/resources/assets/tc/lang/pl_PL.lang +++ b/src/main/resources/assets/tc/lang/pl_PL.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Balast tile.tc:generatorDiesel.name=Generator Dieslowy tile.tc:windMill.name=Wiatrak tile.tc:waterWheel.name=Młyn wodny -tile.tc:lantern.name=Latarnia +tile.lantern.name=Latarnia tile.openFurnaceActive.name=Palenisko (aktywne) tile.openFurnaceIdle.name=Palenisko tile.tc:stopper.name=Bufor Pociągu @@ -25,7 +25,7 @@ tile.tc:tcRailGag.name=Tor Traincraft fluid.tc:fluid.diesel.name=Olej napędowy fluid.tc:fluid.refinedfuel.name=Przetworzone paliwo tile.bridgePillar.name=Filar mostu -tile.tc:switchStand.name=Podstawa przełącznika +tile.switchStand.name=Podstawa przełącznika fluid.diesel.name=Olej napędowy diff --git a/src/main/resources/assets/tc/lang/pt_BR.lang b/src/main/resources/assets/tc/lang/pt_BR.lang index 7a4bbd1ee..a82b4317d 100644 --- a/src/main/resources/assets/tc/lang/pt_BR.lang +++ b/src/main/resources/assets/tc/lang/pt_BR.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Lastro tile.tc:generatorDiesel.name=Gerador a Diesel tile.tc:windMill.name=Moinho de Vento tile.tc:waterWheel.name=Roda d'água -tile.tc:lantern.name=Lanterna +tile.lantern.name=Lanterna tile.openFurnaceActive.name=Forno Siemens-Martin (ativo) tile.openFurnaceIdle.name=Forno Siemens-Martin tile.tc:stopper.name=Para-Choque de Via @@ -25,7 +25,7 @@ tile.tc:tcRailGag.name=Trilho Traincraft fluid.tc:fluid.diesel.name=Óleo Diesel fluid.tc:fluid.refinedfuel.name=Combustível Refinado tile.bridgePillar.name=Pilar de Ponte -tile.tc:switchStand.name=Chave High Star +tile.switchStand.name=Chave High Star tile.tc:mtcTransmitterSpeed.name=MTC Speed Transmitter tile.tc:mtcTransmitterMTC.name=MTC Status Transmitter tile.tc:mtcATOStopTransmitter.name=MTC ATO Stop Point Transmitter diff --git a/src/main/resources/assets/tc/lang/ru_RU.lang b/src/main/resources/assets/tc/lang/ru_RU.lang index 67536c709..7a8365f7c 100644 --- a/src/main/resources/assets/tc/lang/ru_RU.lang +++ b/src/main/resources/assets/tc/lang/ru_RU.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Балласт tile.tc:generatorDiesel.name=Дизельный генератор tile.tc:windMill.name=Ветрогенератор tile.tc:waterWheel.name=Гидрогенератор -tile.tc:lantern.name=Фонарь +tile.lantern.name=Фонарь tile.openFurnaceActive.name=Мартеновская печь (работающая) tile.openFurnaceIdle.name=Мартеновская печь tile.tc:stopper.name=Тупик diff --git a/src/main/resources/assets/tc/lang/si_SI.lang b/src/main/resources/assets/tc/lang/si_SI.lang index 96a93f515..3f815fc31 100644 --- a/src/main/resources/assets/tc/lang/si_SI.lang +++ b/src/main/resources/assets/tc/lang/si_SI.lang @@ -10,7 +10,7 @@ tile.tc:oreTC.ballast.name=Kamenje tile.tc:generatorDiesel.name=Dizelski generator tile.tc:windMill.name=Veternica tile.tc:waterWheel.name=Vodno kolo -tile.tc:lantern.name=Svetilka +tile.lantern.name=Svetilka tile.openFurnaceActive.name=Talilna pe� aktivna tile.openFurnaceIdle.name=Talilna pe� tile.tc:stopper.name=Train buffer diff --git a/src/main/resources/assets/tc/lang/sk_SK.lang b/src/main/resources/assets/tc/lang/sk_SK.lang index 750d7f13a..11868b5d2 100644 --- a/src/main/resources/assets/tc/lang/sk_SK.lang +++ b/src/main/resources/assets/tc/lang/sk_SK.lang @@ -7,7 +7,7 @@ tile.tc:oreTC.ballast.name=Koľajové lôžko tile.tc:generatorDiesel.name=Naftový generátor tile.tc:windMill.name=Veterný mlyn tile.tc:waterWheel.name=Vodný mlyn -tile.tc:lantern.name=Lampáš +tile.lantern.name=Lampáš tile.openFurnaceActive.name=Železiarska pec (aktívna) tile.openFurnaceIdle.name=Železiarska pec tile.tc:stopper.name=Nárazník @@ -22,7 +22,7 @@ tile.tc:tcRailGag.name=Koľaj (Traincraft) fluid.tc:fluid.diesel.name=Nafta fluid.tc:fluid.refinedfuel.name=Rafinovaná Nafta tile.bridgePillar.name=Drevený most -tile.tc:switchStand.name=Výhybka hviezdicového typu +tile.switchStand.name=Výhybka hviezdicového typu tile.mtcspeedtransmitter.name=MTC Vysielač - Rýchlosť tile.mtcstatustransmitter.name=MTC Vysielač - Pozícia tile.mtcatostoppointtransmitter.name=MTC Vysielač - Zastavovací bod ATO