From b2580cec27d4d5e1087f333578e44f85e02d9d9e Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Sat, 23 Nov 2013 12:53:57 +0000 Subject: [PATCH 01/11] Make Anonymous classes less anonymous This shuts up FML, and also means we'll survive a 1.7 upgrade. Maybe. Probably not. Worth a go. --- src/tconstruct/common/TContent.java | 31 ++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 9d9cae60..7181df6d 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -807,8 +807,10 @@ public class TContent implements IFuelHandler void registerItems () { titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon"); + GameRegistry.registerItem(titleIcon, "titleIcon"); String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern"); + GameRegistry.registerItem(blankPattern, "blankPattern"); materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials"); toolRod = new ToolPart(PHConstruct.toolRod, "_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); @@ -816,6 +818,10 @@ public class TContent implements IFuelHandler woodPattern = new Pattern(PHConstruct.woodPattern, "WoodPattern", "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern", "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); armorPattern = new ArmorPattern(PHConstruct.armorPattern, "ArmorPattern", "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); + GameRegistry.registerItem(materials, "materials"); + GameRegistry.registerItem(woodPattern, "woodPattern"); + GameRegistry.registerItem(metalPattern, "metalPattern"); + GameRegistry.registerItem(armorPattern, "armorPattern"); TConstructRegistry.addItemToDirectory("blankPattern", blankPattern); TConstructRegistry.addItemToDirectory("woodPattern", woodPattern); @@ -840,7 +846,9 @@ public class TContent implements IFuelHandler } manualBook = new Manual(PHConstruct.manual); + GameRegistry.registerItem(manualBook, "manualBook"); buckets = new FilledBucket(PHConstruct.buckets); + GameRegistry.registerItem(buckets, "buckets"); pickaxe = new Pickaxe(PHConstruct.pickaxe); shovel = new Shovel(PHConstruct.shovel); @@ -866,16 +874,18 @@ public class TContent implements IFuelHandler shortbow = new Shortbow(PHConstruct.shortbow); arrow = new Arrow(PHConstruct.arrow); - Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe }; - String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", "scythe", - "excavator", "hammer", "battleaxe" }; + Item[] tools = { pickaxe, shovel, hatchet, broadsword, longsword, rapier, dagger, cutlass, frypan, battlesign, mattock, chisel, lumberaxe, cleaver, scythe, excavator, hammer, battleaxe, shortbow, arrow }; + String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver", "scythe", + "excavator", "hammer", "battleaxe", "shortbow", "arrow" }; for (int i = 0; i < tools.length; i++) { + GameRegistry.registerItem(tools[i], toolStrings[i]); // 1.7 compat TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]); } potionLauncher = new PotionLauncher(PHConstruct.potionLauncher).setUnlocalizedName("tconstruct.PotionLauncher"); + GameRegistry.registerItem(potionLauncher, "potionLauncher"); pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead"); shovelHead = new ToolPart(PHConstruct.shovelHead, "_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead"); @@ -914,14 +924,19 @@ public class TContent implements IFuelHandler for (int i = 0; i < toolParts.length; i++) { + GameRegistry.registerItem(toolParts[i], toolPartStrings[i]); // 1.7 compat TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]); } diamondApple = new DiamondApple(PHConstruct.diamondApple).setUnlocalizedName("tconstruct.apple.diamond"); strangeFood = new StrangeFood(PHConstruct.slimefood).setUnlocalizedName("tconstruct.strangefood"); oreBerries = new OreBerries(PHConstruct.oreChunks).setUnlocalizedName("oreberry"); + GameRegistry.registerItem(diamondApple, "diamondApple"); + GameRegistry.registerItem(strangeFood, "strangeFood"); + GameRegistry.registerItem(oreBerries, "oreBerries"); jerky = new Jerky(PHConstruct.jerky, Loader.isModLoaded("HungerOverhaul")).setUnlocalizedName("tconstruct.jerky"); + GameRegistry.registerItem(jerky, "jerky"); //Wearables //heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet, 0).setUnlocalizedName("tconstruct.HeavyHelmet"); @@ -930,6 +945,12 @@ public class TContent implements IFuelHandler //glove = new Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove"); knapsack = new Knapsack(PHConstruct.knapsack).setUnlocalizedName("tconstruct.storage"); goldHead = new GoldenHead(PHConstruct.goldHead, 4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead"); + //GameRegistry.registerItem(heavyHelmet, "heavyHelmet"); + GameRegistry.registerItem(heartCanister, "heartCanister"); + //GameRegistry.registerItem(heavyBoots, "heavyBoots"); + //GameRegistry.registerItem(glove, "glove"); + GameRegistry.registerItem(knapsack, "knapsack"); + GameRegistry.registerItem(goldHead, "goldHead"); LiquidCasting basinCasting = TConstruct.getBasinCasting(); materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3); @@ -937,6 +958,10 @@ public class TContent implements IFuelHandler chestplateWood = new ArmorBasic(PHConstruct.woodChestplate, materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood"); leggingsWood = new ArmorBasic(PHConstruct.woodPants, materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood"); bootsWood = new ArmorBasic(PHConstruct.woodBoots, materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood"); + GameRegistry.registerItem(helmetWood, "helmetWood"); + GameRegistry.registerItem(chestplateWood, "chestplateWood"); + GameRegistry.registerItem(leggingsWood, "leggingsWood"); + GameRegistry.registerItem(bootsWood, "bootsWood"); // essenceCrystal = new EssenceCrystal(PHConstruct.essenceCrystal).setUnlocalizedName("tconstruct.crystal.essence"); From 1387bc6f749a464061eb8ab48609a9ce0ce1a039 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Sat, 23 Nov 2013 14:09:08 +0000 Subject: [PATCH 02/11] Glue block --- resources/assets/tinker/lang/en_US.lang | 2 + .../assets/tinker/textures/blocks/glue.png | Bin 0 -> 508 bytes src/tconstruct/blocks/GlueBlock.java | 48 ++++++++++++++++++ src/tconstruct/common/TContent.java | 5 ++ src/tconstruct/util/config/PHConstruct.java | 5 +- 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 resources/assets/tinker/textures/blocks/glue.png create mode 100644 src/tconstruct/blocks/GlueBlock.java diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 10c95c3e..f7e39258 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -118,6 +118,8 @@ tile.cloth.green.slab.name=Green Wool Slab tile.cloth.red.slab.name=Red Wool Slab tile.cloth.black.slab.name=Black Wool Slab +tile.GlueBlock.name=Glue Block + item.oreberry.iron.name=Iron Oreberry item.oreberry.gold.name=Gold Oreberry item.oreberry.copper.name=Copper Oreberry diff --git a/resources/assets/tinker/textures/blocks/glue.png b/resources/assets/tinker/textures/blocks/glue.png new file mode 100644 index 0000000000000000000000000000000000000000..47ce56eed164e471c497a02917b64e3b3abb209f GIT binary patch literal 508 zcmVX&6H|if=a?)^*Kd41v*mfRm(M*PV@TH=9odKcAi=|AEE2t|^oPppcTJs8EX0 z``ngyj%5h^k}}8QFd$Q6A!Q~>g!4H77;9PnX(tZD)Pj3^i}UJp75l#D$IT6elvx45 zds*iB$W(p&!o2T$u2(AxDbdET3;|;;qN><+9c|NmDoFCZ} Date: Sat, 23 Nov 2013 15:48:19 +0000 Subject: [PATCH 03/11] More gluey things. Glue blocks can be melted in the smeltery, and casted into blocks with the basin. Buckets too. --- resources/assets/tinker/lang/en_US.lang | 1 + .../tinker/textures/blocks/liquid_glue.png | Bin 0 -> 6612 bytes .../textures/blocks/liquid_glue.png.mcmeta | 3 + .../textures/blocks/liquid_glue_flow.png | Bin 0 -> 3579 bytes .../blocks/liquid_glue_flow.png.mcmeta | 3 + .../textures/items/materials/bucket_glue.png | Bin 0 -> 531 bytes .../items/materials/material_glueingot.png | Bin 0 -> 337 bytes src/tconstruct/blocks/GlueFluid.java | 65 ++++++++++++++++++ src/tconstruct/client/TClientEvents.java | 4 +- src/tconstruct/common/TContent.java | 25 +++++-- src/tconstruct/items/FilledBucket.java | 21 ++++-- .../library/crafting/FluidType.java | 4 +- src/tconstruct/util/config/PHConstruct.java | 7 +- 13 files changed, 118 insertions(+), 15 deletions(-) create mode 100644 resources/assets/tinker/textures/blocks/liquid_glue.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_glue.png.mcmeta create mode 100644 resources/assets/tinker/textures/blocks/liquid_glue_flow.png create mode 100644 resources/assets/tinker/textures/blocks/liquid_glue_flow.png.mcmeta create mode 100644 resources/assets/tinker/textures/items/materials/bucket_glue.png create mode 100644 resources/assets/tinker/textures/items/materials/material_glueingot.png create mode 100644 src/tconstruct/blocks/GlueFluid.java diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index f7e39258..9591e468 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -414,6 +414,7 @@ item.tconstruct.bucket.Electrum.name=Molten Electrum Bucket item.tconstruct.bucket.Ender.name=Liquified Ender Bucket item.tconstruct.bucket.Slime.name=Liquid Slime Bucket item.tconstruct.bucket.PigIron.name=Molten Pig Iron Bucket +item.tconstruct.bucket.Glue.name=Sticky Glue Bucket item.tconstruct.bowstring.string.name=Bowstring item.tconstruct.bowstring.enchantedfabriI donc.name=Enchanted Bowstring diff --git a/resources/assets/tinker/textures/blocks/liquid_glue.png b/resources/assets/tinker/textures/blocks/liquid_glue.png new file mode 100644 index 0000000000000000000000000000000000000000..7559250188f3c6a2558d0572d2caef690c1be13d GIT binary patch literal 6612 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�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 literal 0 HcmV?d00001 diff --git a/src/tconstruct/blocks/GlueFluid.java b/src/tconstruct/blocks/GlueFluid.java new file mode 100644 index 00000000..f7ad3d8a --- /dev/null +++ b/src/tconstruct/blocks/GlueFluid.java @@ -0,0 +1,65 @@ +package tconstruct.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.fluids.BlockFluidFinite; +import net.minecraftforge.fluids.Fluid; + +public class GlueFluid extends BlockFluidFinite { + + Icon stillIcon; + Icon flowIcon; + + public GlueFluid(int id, Fluid fluid, Material material) + { + super(id, fluid, material); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons (IconRegister iconRegister) + { + stillIcon = iconRegister.registerIcon("tinker:liquid_glue"); + flowIcon = iconRegister.registerIcon("tinker:liquid_glue_flow"); + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon (int side, int meta) + { + if (side == 0 || side == 1) + return stillIcon; + return flowIcon; + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + entity.motionX *= 0.1; + entity.motionZ *= 0.1; + + if (entity instanceof EntityLivingBase) { + EntityLivingBase lvb = (EntityLivingBase)entity; + // Well you'd feel ill too standing in glue... + if (lvb.isPotionActive(Potion.hunger)) { + lvb.getActivePotionEffect(Potion.hunger).duration = 20; + } else { + lvb.addPotionEffect(new PotionEffect(Potion.hunger.getId(), 20, 4)); + } + + // Glue is sticky stuff + if (lvb.isPotionActive(Potion.moveSlowdown)) { + lvb.getActivePotionEffect(Potion.moveSlowdown).duration = 30; + } else { + lvb.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 30, 4)); + } + } + } +} diff --git a/src/tconstruct/client/TClientEvents.java b/src/tconstruct/client/TClientEvents.java index 22437194..5988e4ed 100644 --- a/src/tconstruct/client/TClientEvents.java +++ b/src/tconstruct/client/TClientEvents.java @@ -58,8 +58,8 @@ public class TClientEvents /* Liquids */ - Icon[] stillIcons = new Icon[1]; - Icon[] flowIcons = new Icon[1]; + Icon[] stillIcons = new Icon[2]; + Icon[] flowIcons = new Icon[2]; @ForgeSubscribe public void preStitch (TextureStitchEvent.Pre event) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 7c028a27..2ab327f6 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -248,6 +248,10 @@ public class TContent implements IFuelHandler public static Block slimeChannel; public static Block slimePad; + //Glue + public static Fluid glueFluid; + public static Block glueFluidBlock; + //Ores public static Block oreSlag; public static Block oreGravel; @@ -324,8 +328,8 @@ public class TContent implements IFuelHandler //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true); } - public static Fluid[] fluids = new Fluid[26]; - public static Block[] fluidBlocks = new Block[25]; + public static Fluid[] fluids = new Fluid[27]; + public static Block[] fluidBlocks = new Block[26]; void registerBlocks () { @@ -716,12 +720,23 @@ public class TContent implements IFuelHandler blueSlimeFluid.setBlockID(slimePool); FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(blueSlimeFluid, 1000), new ItemStack(buckets, 1, 24), new ItemStack(Item.bucketEmpty))); + //Glue + glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200); + if (!FluidRegistry.registerFluid(glueFluid)) + glueFluid = FluidRegistry.getFluid("glue"); + glueFluidBlock = new GlueFluid(PHConstruct.glueFluidBlock, glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(slimeStep).setUnlocalizedName("liquid.glue"); + GameRegistry.registerBlock(glueFluidBlock, "liquid.glue"); + fluids[25] = glueFluid; + fluidBlocks[25] = glueFluidBlock; + glueFluid.setBlockID(glueFluidBlock); + FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(glueFluid, 1000), new ItemStack(buckets, 1, 26), new ItemStack(Item.bucketEmpty))); + pigIronFluid = new Fluid("pigiron.molten"); if (!FluidRegistry.registerFluid(pigIronFluid)) pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); else pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300); - fluids[25] = pigIronFluid; + fluids[26] = pigIronFluid; slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(slimeStep).setLightOpacity(0).setUnlocalizedName("slime.gel"); GameRegistry.registerBlock(slimeGel, SlimeGelItemBlock.class, "slime.gel"); @@ -1593,7 +1608,7 @@ public class TContent implements IFuelHandler { tableCasting.addCastingRecipe(new ItemStack(buckets, 1, sc), new FluidStack(fluids[sc], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); } - tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 25), new FluidStack(fluids[25], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); + tableCasting.addCastingRecipe(new ItemStack(buckets, 1, 26), new FluidStack(fluids[26], FluidContainerRegistry.BUCKET_VOLUME), bucket, true, 10); // Clear glass pane casting tableCasting.addCastingRecipe(new ItemStack(glassPane), new FluidStack(moltenGlassFluid, 250), null, 80); @@ -1677,6 +1692,7 @@ public class TContent implements IFuelHandler basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender + basinCasting.addCastingRecipe(new ItemStack(glueBlock), new FluidStack(glueFluid, TConstruct.blockLiquidValue), null, true, 100); //glue // basinCasting.addCastingRecipe(new ItemStack(slimeGel, 1, 0), new FluidStack(blueSlimeFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); @@ -1767,6 +1783,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 640*9)); + Smeltery.addMelting(glueBlock, 0, 250, new FluidStack(glueFluid, TConstruct.blockLiquidValue)); Smeltery.addMelting(clearGlass, 0, 500, new FluidStack(moltenGlassFluid, 1000)); Smeltery.addMelting(glassPane, 0, 350, new FluidStack(moltenGlassFluid, 250)); diff --git a/src/tconstruct/items/FilledBucket.java b/src/tconstruct/items/FilledBucket.java index 9c8bc986..76b88b08 100644 --- a/src/tconstruct/items/FilledBucket.java +++ b/src/tconstruct/items/FilledBucket.java @@ -2,6 +2,8 @@ package tconstruct.items; import java.util.List; +import net.minecraftforge.fluids.BlockFluidFinite; +import tconstruct.TConstruct; import tconstruct.blocks.logic.LiquidTextureLogic; import tconstruct.common.TContent; @@ -137,11 +139,16 @@ public class FilledBucket extends ItemBucket } else { - int id = 0; - int metadata = 0; - if (type == 25) - metadata = 0; - world.setBlock(clickX, clickY, clickZ, TContent.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids + try { + int metadata = 0; + if (TContent.fluidBlocks[type] instanceof BlockFluidFinite) + metadata = 7; + + world.setBlock(clickX, clickY, clickZ, TContent.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids + } catch (ArrayIndexOutOfBoundsException ex) { + TConstruct.logger.warning("AIOBE occured when placing bucket into world; " + ex); + return false; + } return true; } @@ -180,8 +187,8 @@ public class FilledBucket extends ItemBucket } public static final String[] materialNames = new String[] { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Cobalt", "Ardite", "Bronze", "AluBrass", "Manyullyn", "Alumite", "Obsidian", "Steel", - "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "PigIron" }; + "Glass", "Stone", "Villager", "Cow", "Nickel", "Lead", "Silver", "Shiny", "Invar", "Electrum", "Ender", "Slime", "Glue", "PigIron" }; public static final String[] textureNames = new String[] { "iron", "gold", "copper", "tin", "aluminum", "cobalt", "ardite", "bronze", "alubrass", "manyullyn", "alumite", "obsidian", "steel", - "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "pigiron" }; + "glass", "stone", "emerald", "blood", "nickel", "lead", "silver", "shiny", "invar", "electrum", "ender", "slime", "glue", "pigiron" }; } diff --git a/src/tconstruct/library/crafting/FluidType.java b/src/tconstruct/library/crafting/FluidType.java index b919fd45..6bd6a857 100644 --- a/src/tconstruct/library/crafting/FluidType.java +++ b/src/tconstruct/library/crafting/FluidType.java @@ -59,7 +59,9 @@ public enum FluidType /** Slime Smelting **/ Slime(TContent.slimeGel.blockID, 0, 250, TContent.blueSlimeFluid, false), /** Pigiron Smelting **/ - PigIron(TContent.meatBlock.blockID, 0, 610, TContent.pigIronFluid, true); + PigIron(TContent.meatBlock.blockID, 0, 610, TContent.pigIronFluid, true), + /** Glue Smelting **/ + Glue(TContent.glueBlock.blockID, 0, 125, TContent.glueFluid, false); public final int renderBlockID; public final int renderMeta; diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 1b67818f..71d2dc31 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -163,6 +163,7 @@ public class PHConstruct woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244); woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); glueBlock = config.getBlock("Glue Block", 3256).getInt(3256); + glueFluidBlock = config.getBlock("Glue Fluid Block", 3257).getInt(3257); castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235); @@ -486,6 +487,10 @@ public class PHConstruct public static int slimeChannel; public static int slimePad; + // Glue + public static int glueFluidBlock; + public static int glueBlock; + //Decoration public static int stoneTorch; public static int stoneLadder; @@ -497,7 +502,6 @@ public class PHConstruct public static int meatBlock; public static int woolSlab1; public static int woolSlab2; - public static int glueBlock; //Patterns and misc public static int blankPattern; @@ -717,6 +721,7 @@ public class PHConstruct //Looks public static int connectedTexturesMode; public static File cfglocation; + //dimensionblacklist public static boolean slimeIslGenDim0Only; public static int[] cfgDimBlackList; From 3837ecdb4561464bec1c2516a83d7a02a8140a79 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Sat, 23 Nov 2013 16:09:12 +0000 Subject: [PATCH 04/11] Glue ingots --- src/tconstruct/common/TContent.java | 3 +++ src/tconstruct/items/MaterialItem.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 2ab327f6..c23f155e 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1597,6 +1597,7 @@ public class TContent implements IFuelHandler //Ingots tableCasting.addCastingRecipe(new ItemStack(materials, 1, 2), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), ingotcast, 80); //stone + tableCasting.addCastingRecipe(new ItemStack(materials, 1, 36), new FluidStack(glueFluid, TConstruct.ingotLiquidValue), ingotcast, 50); //Gems tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new FluidStack(moltenEmeraldFluid, 640), gemcast, 80); @@ -1747,6 +1748,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(FluidType.AluminumBrass, new ItemStack(blankPattern, 4, 1), -50, TConstruct.ingotLiquidValue); Smeltery.addMelting(FluidType.Gold, new ItemStack(blankPattern, 4, 2), -50, TConstruct.ingotLiquidValue); + Smeltery.addMelting(FluidType.Glue, new ItemStack(materials, 1, 36), 0, TConstruct.ingotLiquidValue); Smeltery.addMelting(FluidType.Ender, new ItemStack(Item.enderPearl, 4), 0, 250); Smeltery.addMelting(metalBlock, 10, 50, new FluidStack(moltenEnderFluid, 1000)); @@ -1988,6 +1990,7 @@ public class TContent implements IFuelHandler ensureOreIsRegistered("ingotGold", new ItemStack(Item.ingotGold)); OreDictionary.registerOre("ingotObsidian", new ItemStack(materials, 1, 18)); OreDictionary.registerOre("ingotPigIron", new ItemStack(materials, 1, 34)); + OreDictionary.registerOre("ingotRubber", new ItemStack(materials, 1, 36)); OreDictionary.registerOre("blockCobalt", new ItemStack(metalBlock, 1, 0)); OreDictionary.registerOre("blockArdite", new ItemStack(metalBlock, 1, 1)); diff --git a/src/tconstruct/items/MaterialItem.java b/src/tconstruct/items/MaterialItem.java index 3713c372..06122548 100644 --- a/src/tconstruct/items/MaterialItem.java +++ b/src/tconstruct/items/MaterialItem.java @@ -24,12 +24,12 @@ public class MaterialItem extends CraftingItem static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", "CopperIngot", "TinIngot", "", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", "TinNugget", "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget", - "SteelNugget", "PigIronIngot", "PigIronNugget" }; + "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueIngot" }; static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone", "copperingot", "tiningot", "aluminumingot", "aluminumraw", "bronzeingot", "alubrassingot", "alumiteingot", "steelingot", "blueslimecrystal", "obsidianingot", "nugget_iron", "nugget_copper", "nugget_tin", "nugget_aluminum", "", "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn", - "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron" }; + "nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", "glueingot" }; /*@Override @SideOnly(Side.CLIENT) From 7a18a41e00dbb82321910ffb44269584a7f39b92 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Sat, 23 Nov 2013 16:16:17 +0000 Subject: [PATCH 05/11] It kills horses? SHIP IT --- src/tconstruct/blocks/logic/SmelteryLogic.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/tconstruct/blocks/logic/SmelteryLogic.java b/src/tconstruct/blocks/logic/SmelteryLogic.java index 72284e2a..0f526e9b 100644 --- a/src/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/tconstruct/blocks/logic/SmelteryLogic.java @@ -10,6 +10,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.monster.EntityIronGolem; +import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -345,6 +346,17 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } } } + else if (o instanceof EntityHorse) + { + EntityHorse horse = (EntityHorse) o; + if (horse.attackEntityFrom(new SmelteryDamageSource(), 5)) + { + if (currentLiquid + 200 < maxLiquid) + { + this.fill(new FluidStack(TContent.glueFluid, 200), true); + } + } + } else if (o instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) o; From 900d1332c51ad0d4ce4c4e9b0854f5b419b152dc Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 23 Nov 2013 19:16:47 +0300 Subject: [PATCH 06/11] Update ru_RU.lang --- resources/assets/tinker/lang/ru_RU.lang | 249 +++++++++++++++++++++--- 1 file changed, 222 insertions(+), 27 deletions(-) diff --git a/resources/assets/tinker/lang/ru_RU.lang b/resources/assets/tinker/lang/ru_RU.lang index fd080f7f..6837be6c 100644 --- a/resources/assets/tinker/lang/ru_RU.lang +++ b/resources/assets/tinker/lang/ru_RU.lang @@ -16,6 +16,7 @@ ToolStation.Parts.name=Создатель деталей ToolStation.PatternChest.name=Сундук со схемами ToolStation.PatternShaper.name=Трафаретный стол ToolStation.CastingTable.name=Литейный стол +tile.FurnaceSlab.name=Плита печки tile.ToolForge.name=Инструментальная кузница tile.Armor.DryingRack.name=Штатив для сушки @@ -24,8 +25,11 @@ CraftedSoil.Grout.name=Осадок CraftedSoil.BlueSlime.name=Слизистая грязь CraftedSoil.GraveyardSoil.name=Кладбищенская почва CraftedSoil.ConsecratedSoil.name=Священная почва +tile.CastingChannel.name=Разливочный канал +tile.slime.channel.name=Сточная слизь +tile.slime.pad.name=Прыжковая панель -MetalOre.NetherSlag.name=Адская окалина +MetalOre.NetherSlag.name=Окалина Нижнего мира MetalOre.Cobalt.name=Кобальтовая руда MetalOre.Ardite.name=Ардитовая руда MetalOre.Copper.name=Медная руда @@ -65,17 +69,17 @@ block.brownstone.smooth.chiseled.slab.name=Плита из резного бур block.brick.obsidian.name=Обсидиановый кирпич block.brick.sandstone.name=Песчаный кирпич -block.brick.netherrack.name=Адский кирпич +block.brick.netherrack.name=Кирпич Нижнего мира block.brick.iron.name=Железный кирпич block.brick.gold.name=Золотой кирпич block.brick.diamond.name=Алмазный кирпич block.brick.lapis.name=Лазуритовый кирпич block.brick.stone.refined.name=Кирпич из отполированного камня -block.brick.redstone.name=Редстоун кирпич +block.brick.redstone.name=Красный кирпич block.brick.bone.name=Костяной кирпич block.brick.slime.name=Слизистый кирпич block.brick.blueslime.name=Слизистый кирпич -block.brick.endstone.name=Кирпич из камня края +block.brick.endstone.name=Кирпич из камня Края block.brick.obsidian.ingot.name=Обсидиановый кирпич block.fancybrick.obsidian.name=Красивый обсидиановый кирпич @@ -86,7 +90,7 @@ block.fancybrick.gold.name=Красивый золотой кирпич block.fancybrick.diamond.name=Красивый алмазный кирпич block.fancybrick.lapis.name=Красивый лазуритовый кирпич block.fancybrick.stone.refined.name=Кирпич из красивого отполированного камня -block.fancybrick.redstone.name=Кирпич из красивого редстоуна +block.fancybrick.redstone.name=Кирпич из красивого красного камня block.fancybrick.bone.name=Красивый костяной кирпич block.fancybrick.slime.name=Красивый слизистый кирпич block.fancybrick.blueslime.name=Красивый слизистый кирпич @@ -95,6 +99,8 @@ block.fancybrick.obsidian.ingot.name=Красивый обсидиановый block.fancybrick.stone.road.name=Каменная дорого block.fancybrick.stone.name=Кирпич из красивого камня +tile.rail.wood.name=Деревянные рельсы + tile.cloth.white.slab.name=Плита из шерсти tile.cloth.orange.slab.name=Плита из оранжевой шерсти tile.cloth.magenta.slab.name=Плита из сиреневой шерсти @@ -112,6 +118,8 @@ tile.cloth.green.slab.name=Плита из зелёной шерсти tile.cloth.red.slab.name=Плита из красной шерсти tile.cloth.black.slab.name=Плита из чёрной шерсти +tile.GlueBlock.name=Блок клея + item.oreberry.iron.name=Кусочки железа item.oreberry.gold.name=Кусочки золота item.oreberry.copper.name=Кусочки меди @@ -120,16 +128,72 @@ item.oreberry.aluminum.name=Кусочки алюминия item.oreberry.essence.name=Кусочки концентрированной эссенции item.goldenhead.name=Золотистая голова -item.tconstruct.titleicon.name=Spawn +item.tconstruct.titleicon.name=Призвать существо - + +item.tconstruct.Pattern.blank_pattern.name=Пустая схема +item.tconstruct.Pattern.rod.name=Схема стержня инструмента +item.tconstruct.Pattern.pickaxe.name=Схема головки кирки +item.tconstruct.Pattern.shovel.name=Схема головки лопаты +item.tconstruct.Pattern.axe.name=Схема головки топора +item.tconstruct.Pattern.swordblade.name=Схема лезвия меча +item.tconstruct.Pattern.largeguard.name=Wide Guard Pattern +item.tconstruct.Pattern.mediumguard.name=Hand Guard Pattern +item.tconstruct.Pattern.crossbar.name=Crossbar Pattern +item.tconstruct.Pattern.binding.name=Схема связующего звена инструмента +item.tconstruct.Pattern.frypan.name=Схема сковороды +item.tconstruct.Pattern.sign.name=Wide Board Pattern +item.tconstruct.Pattern.knifeblade.name=Схема лезвия ножа +item.tconstruct.Pattern.chisel.name=Схема головки зубила +item.tconstruct.Pattern.largerod.name=Схема прочного стержня +item.tconstruct.Pattern.toughbinding.name=Схема прочного связующего звена +item.tconstruct.Pattern.largeplate.name=Large Plate Pattern +item.tconstruct.Pattern.broadaxe.name=Broadaxe Head Pattern +item.tconstruct.Pattern.scythe.name=Схема головки косы +item.tconstruct.Pattern.excavator.name=Схема головки землекопалки +item.tconstruct.Pattern.largeblade.name=Схема большого лезвия +item.tconstruct.Pattern.hammerhead.name=Схема головки молотка +item.tconstruct.Pattern.fullguard.name=Full Guard Pattern +item.tconstruct.Pattern.bowstring.name=Схема тетивы +item.tconstruct.Pattern.fletching.name=Схема оперения +item.tconstruct.Pattern.arrowhead.name=Схема наконечника + +item.tconstruct.Pattern.blank_cast.name=Пустой слепок +item.tconstruct.MetalPattern.rod.name=Слепок стержня инструмента +item.tconstruct.MetalPattern.pickaxe.name=Слепок головки кирки +item.tconstruct.MetalPattern.shovel.name=Слепок головки лопаты +item.tconstruct.MetalPattern.axe.name=Слепок головки топора +item.tconstruct.MetalPattern.swordblade.name=Слепок лезвия меча +item.tconstruct.MetalPattern.largeguard.name=Wide Guard Cast +item.tconstruct.MetalPattern.mediumguard.name=Hand Guard Cast +item.tconstruct.MetalPattern.crossbar.name=Crossbar Cast +item.tconstruct.MetalPattern.binding.name=Слепок связующего звена инструмента +item.tconstruct.MetalPattern.frypan.name=Слепок сковороды +item.tconstruct.MetalPattern.sign.name=Wide Board Cast +item.tconstruct.MetalPattern.knifeblade.name=Слепок лезвия ножа +item.tconstruct.MetalPattern.chisel.name=Слепок головки зубила +item.tconstruct.MetalPattern.largerod.name=Слепок прочного стержня +item.tconstruct.MetalPattern.toughbinding.name=Слепок прочного связующего звена +item.tconstruct.MetalPattern.largeplate.name=Large Plate Cast +item.tconstruct.MetalPattern.broadaxe.name=Broadaxe Head Cast +item.tconstruct.MetalPattern.scythe.name=Слепок головки косы +item.tconstruct.MetalPattern.excavator.name=Слепок головки землекопалки +item.tconstruct.MetalPattern.largeblade.name=Слепок большого лезвия +item.tconstruct.MetalPattern.hammerhead.name=Слепок головки молотка +item.tconstruct.MetalPattern.fullguard.name=Full Guard Cast +item.tconstruct.MetalPattern.bowstring.name=Слепок тетивы +item.tconstruct.MetalPattern.fletching.name=Слепок оперения +item.tconstruct.MetalPattern.arrowhead.name=Слепок наконечника +item.tconstruct.MetalPattern.ingot.name=Слепок слитка +item.tconstruct.MetalPattern.gem.name=Слепок жемчужины item.tconstruct.Materials.PaperStack.name=Кучка бумаги -item.tconstruct.Materials.SlimeCrystal.name=Кристалл слизи +item.tconstruct.Materials.SlimeCrystal.name=Слизистый кристалл item.tconstruct.Materials.SearedBrick.name=Обожжённый кирпич item.tconstruct.Materials.CobaltIngot.name=Кобальтовый слиток item.tconstruct.Materials.ArditeIngot.name=Ардитовый слиток item.tconstruct.Materials.ManyullynIngot.name=Мануллиновый слиток item.tconstruct.Materials.Mossball.name=Шарик мха -item.tconstruct.Materials.LavaCrystal.name=Кристалл лавы +item.tconstruct.Materials.LavaCrystal.name=Лавовый кристалл item.tconstruct.Materials.NecroticBone.name=Некротическая кость item.tconstruct.Materials.CopperIngot.name=Медный слиток item.tconstruct.Materials.TinIngot.name=Оловянный слиток @@ -139,7 +203,7 @@ item.tconstruct.Materials.BronzeIngot.name=Бронзовый слиток item.tconstruct.Materials.AluBrassIngot.name=Слиток алюминиевой латуни item.tconstruct.Materials.AlumiteIngot.name=Алюмитовый слиток item.tconstruct.Materials.SteelIngot.name=Стальной слиток -item.tconstruct.Materials.BlueSlimeCrystal.name=Кристалл слизи +item.tconstruct.Materials.BlueSlimeCrystal.name=Слизистый кристалл item.tconstruct.Materials.ObsidianIngot.name=Обсидиановый слиток item.tconstruct.Materials.IronNugget.name=Железный самородок item.tconstruct.Materials.CopperNugget.name=Медный самородок @@ -156,8 +220,25 @@ item.tconstruct.Materials.ManyullynNugget.name=Мануллиновый само item.tconstruct.Materials.BronzeNugget.name=Бронзовый самородок item.tconstruct.Materials.AlumiteNugget.name=Алюмитовый самородок item.tconstruct.Materials.SteelNugget.name=Кусочек стали +item.tconstruct.Materials.PigIronIngot.name=Чугунный слиток +item.tconstruct.Materials.PigIronNugget.name=Чугунная тарелка -item.tconstruct.crystal.essence.name=Кристалл эссенции +item.tconstruct.ArmorPattern.helmet.name=Слепок шлема +item.tconstruct.ArmorPattern.chestplate.name=Слепок кирасы +item.tconstruct.ArmorPattern.leggings.name=Слепок понож +item.tconstruct.ArmorPattern.boots.name=Слепок ботинок + +item.tconstruct.helmetWood.name=Деревянный шлем +item.tconstruct.chestplateWood.name=Деревянная кираса +item.tconstruct.leggingsWood.name=Деревянные поножи +item.tconstruct.bootsWood.name=Деревянные ботинки + +item.tconstruct.jerky.beef.name=Вяленая говядина +item.tconstruct.jerky.pig.name=Вяленый бекон +item.tconstruct.jerky.chicken.name=Вяленая курятина +item.tconstruct.jerky.sheep.name=Вяленая баранина +item.tconstruct.jerky.fish.name=Вяленая рыбка +item.tconstruct.jerky.zombie.name=Вяленый монстр Smeltery.Controller.name=Контроллер плавильни Smeltery.Drain.name=Водосток плавильни @@ -170,18 +251,20 @@ Smeltery.Road.name=Обожжённая дорога Smeltery.Brick.Fancy.name=Красивые обожжённые кирпичи Smeltery.Brick.Square.name=Резные обожжённые кирпичи Smeltery.Brick.Creeper.name=Резные обожжённые кирпичи +Smeltery.Channel.name=Разливочный канал LavaTank.Tank.name=Обожжённый резервуар LavaTank.Gague.name=Обожжённое стекло LavaTank.Window.name=Обожжённое окно -tile.landmine.name=Фугас +tile.landmine.name=Мина + tile.trap.punji.name=Колышек tile.trap.barricade.oak.name=Баррикада из дуба tile.trap.barricade.spruce.name=Баррикада из ели tile.trap.barricade.birch.name=Баррикада из берёзы tile.trap.barricade.jungle.name=Баррикада из тропического дерева -tile.extractor.essence.name=Экстрактор эссенции +tile.explosive.slime.name=SDX StorageMetals.Cobalt.name=Кобальтовый блок StorageMetals.Ardite.name=Ардитовый блок @@ -193,10 +276,11 @@ StorageMetals.Aluminum.name=Алюминиевый блок StorageMetals.AlBrass.name=Блок алюминиевой латуни StorageMetals.Alumite.name=Алюмитовый блок StorageMetals.Steel.name=Стальной блок -StorageMetals.Ender.name=Блок твёрдого эндера +StorageMetals.Ender.name=Блок твёрдого камня Края tile.decoration.stonetorch.name=Факел -tile.CraftingStation.name=Станция крафта +tile.decoration.stoneladder.name=Лестница +tile.CraftingStation.name=Станция создания block.glass.pure.name=Чистое стекло block.glass.soul.name=Душевное стекло @@ -258,7 +342,7 @@ block.soil.slab.graveyardsoil.name=Плита из кладбищенской п block.soil.slab.consecratedsoil.name=Плита из священной почвы block.slime.soil.blue.name=Земля из синей слизи -block.slime.leaves.blue.name=Листва слизи +block.slime.leaves.blue.name=Слизистая листва block.slime.sapling.bluegreen.name=Слизистый саженец block.slime.grass.blue.name=Слизистая трава block.slime.grass.dirt.name=Слизистая трава @@ -268,14 +352,15 @@ block.slime.congealed.green.name=Застывшая зелёная слизь item.tconstruct.storage.knapsack.name=Ранец item.tconstruct.blankpattern.pattern.name=Пустая схема -item.tconstruct.blankpattern.cast.name=Чистый чугун +item.tconstruct.blankpattern.cast.name=Пустой слепок item.tconstruct.Bowstring.string.name=Тетива item.tconstruct.Bowstring.enchantedfabric.name=Зачарованная тетива -item.tconstruct.Fletching.feather.name=Feather Fletching -item.tconstruct.Fletching.leaf.name=Leaf Fletching -item.tconstruct.Fletching.slime.name=Slime Fletching -item.tconstruct.Fletching.blueslime.name=Slime Fletching +item.tconstruct.Bowstring.flamestring.name=Огненная тетива +item.tconstruct.Fletching.feather.name=Перьевое оперение +item.tconstruct.Fletching.leaf.name=Листовое оперение +item.tconstruct.Fletching.slime.name=Слизистое оперение +item.tconstruct.Fletching.blueslime.name=Слизистое оперение item.tconstruct.manual.beginner.name=Материалы и Вы item.tconstruct.manual.toolstation.name=Материалы и Вы @@ -304,8 +389,10 @@ item.tconstruct.bucket.Silver.name=Ведро расплавленного се item.tconstruct.bucket.Shiny.name=Ведро расплавленного блеска item.tconstruct.bucket.Invar.name=Ведро расплавленного инвара item.tconstruct.bucket.Electrum.name=Ведро расплавленного электрума -item.tconstruct.bucket.Ender.name=Ведро сжиженного эндера +item.tconstruct.bucket.Ender.name=Ведро жидкости Края item.tconstruct.bucket.Slime.name=Ведро жидкой слизи +item.tconstruct.bucket.PigIron.name=Ведро расплавленного чугуна +item.tconstruct.bucket.Glue.name=Ведро липкого клея item.tconstruct.bowstring.string.name=Тетива item.tconstruct.bowstring.enchantedfabriI donc.name=Зачарованная тетива @@ -333,7 +420,33 @@ tile.metal.molten.lead.name=Расплавленный свинец tile.metal.molten.shiny.name=Расплавленный блеск tile.metal.molten.invar.name=Расплавленный инвар tile.metal.molten.Electrum.name=Расплавленный электрум -tile.fluid.ender.name=Сжиженный эндер +tile.fluid.ender.name=Жидкость Края +tile.liquid.slime.name=Сжиженная слизь + +LiquidMetal.Iron.name=Расплавленное железо +LiquidMetal.Gold.name=Расплавленное золото +LiquidMetal.Copper.name=Расплавленная медь +LiquidMetal.Tin.name=Жидкое олово +LiquidMetal.Aluminum.name=Расплавленной алюминий +LiquidMetal.Cobalt.name=Расплавленный кобальт +LiquidMetal.Ardite.name=Расплавленный ардит +LiquidMetal.Bronze.name=Расплавленная бронза +LiquidMetal.AluBrass.name=Расплавленная алюминиевая латунь +LiquidMetal.Manyullyn.name=Расплавленный мануллин +LiquidMetal.Alumite.name=Расплавленный алюмит +LiquidMetal.Obsidian.name=Расплавленный обсидиан +LiquidMetal.Steel.name=Расплавленная сталь +LiquidMetal.Glass.name=Расплавленное стекло +LiquidMetal.Stone.name=Расплавленный обожжённый камень +LiquidMetal.Villager.name=Сжиженный изумруд +LiquidMetal.Cow.name=Кровь +LiquidMetal.Nickel.name=Расплавленный никель +LiquidMetal.Silver.name=Расплавленное серебро +LiquidMetal.Lead.name=Расплавленный свинец +LiquidMetal.Shiny.name=Расплавленный блеск +LiquidMetal.Invar.name=Расплавленный инвар +LiquidMetal.Electrum.name=Расплавленный электрум +LiquidMetal.Ender.name=Жидкость Края item.food.apple.diamond.name=Драгоценное яблоко item.tconstruct.strangefood.edibleslime.name=Желатиновая слизь @@ -348,9 +461,10 @@ SearedBlock.Basin.name=Литейный резервуар entity.TConstruct.EdibleSlime.name=Синий слизень entity.TConstruct.KingSlime.name=Король слизней -entity.TConstruct.Gardeslime.name=Слизень охраник +entity.TConstruct.Gardeslime.name=Слизень охраник +entity.TConstruct.MiniGardy.name=Слизень охраник -key.tarmor=Armor Gui +key.tarmor=Gui брони key.tcapes.reload=Перезагрузить плащи death.one.smeltery=%1$s превратился в зелёный сойлент @@ -358,6 +472,9 @@ death.two.smeltery=%1$s сплавился с плавильней death.three.smeltery=%1$s станет ступенькой в нашей революции! death.four.smeltery=%1$s думал, что купание в горячих жидкостях хорошая идея +death.attack.Landmine=%1$s наблюдал как его ноги взорвались на мине +death.attack.FireworkExplode=%1$s был разорван диким взрывом фейерверка + fluid.iron.molten=Расплавленное железо fluid.gold.molten=Расплавленное золото fluid.copper.molten=Расплавленная медь @@ -378,7 +495,85 @@ fluid.blood=Кровь fluid.nickel.molten=Расплавленный никель fluid.lead.molten=Расплавленный свинец fluid.silver.molten=Расплавленное серебро -fluid.platinum.molten=Расплавленная платина -fluid.invar=Расплавленный инвар fluid.shiny=Расплавленный блеск -fluid.ender=Жидкий эндер +fluid.invar=Расплавленный инвар +fluid.electrum.molten=Расплавленный электрум +fluid.ender=Жидкость Края +fluid.slime.blue=Жидкая синяя слизь +fluid.pigiron.molten=Чугун + +tconstruct.achievementPage.name=TConstruct +achievement.tconstruct.beginner=Learning to Tinker +achievement.tconstruct.pattern=Stencil Worker +achievement.tconstruct.tinkerer=Tinkerer +achievement.tconstruct.proTinkerer=Pro Tinkerer +achievement.tconstruct.smelteryMaker=Создатель плавильни +achievement.tconstruct.preparedFight=К бою готов +achievement.tconstruct.enemySlayer=Убийца врагов +achievement.tconstruct.dualConvenience=Двойное удобство + +achievement.tconstruct.beginner.desc=Откройте руководство "Материалы и Вы" +achievement.tconstruct.pattern.desc=Создайте свой ​​первый пустой шаблон +achievement.tconstruct.tinkerer.desc=Создайте свой первый инструмент +achievement.tconstruct.proTinkerer.desc=Создайте свой первый "tier 2" инструмент +achievement.tconstruct.smelteryMaker.desc=Создайте компонент плавильни +achievement.tconstruct.preparedFight.desc=Создайте своё первое оружие +achievement.tconstruct.enemySlayer.desc=Убейте моба +achievement.tconstruct.dualConvenience.desc=Убийте моба сковородой, а затем приготовьте его мясо на ней + +knapsack.tooltip=Ранец для хранения ваших вещей. +strangefood1.tooltip=\u00a7b\u00a7oПахнет ужасно, но если вам= +strangefood2.tooltip=\u00a7b\u00a7oбольше нечего поесть...= +hambone1.tooltip=\u00A74Hambone! +hambone2.tooltip=Подходит для основания маяка +metalblock.tooltip=Подходит для основания маяка +craftedsoil1.tooltip=Лечит нежить +craftedsoil2.tooltip=Губительно для нежити +fancybrick1.tooltip=Несколько дорогой +fancybrick2.tooltip=Довольно дорогой +fancybrick3.tooltip=Излучает сигнал красн. камня до +fancybrick4.tooltip=4 блоков +fancybrick4.tooltip=Упругий! +brick1.tooltip=Несколько дорогой +brick2.tooltip=Довольно дорогой +brick3.tooltip=Излучает сигнал красн. камня до +brick4.tooltip=4 блоков +brick4.tooltip=Упругий! +craftedsoil.slab1.tooltip=Лечит нежить +craftedsoil.slab2.tooltip=Губительно для нежити +speedblock1.tooltip=Вы бегаете довольно быстро на этом +speedblock2.tooltip=Вы бегаете немного быстрее на этом +speedblock.slab1.tooltip=Вы бегаете довольно быстро на этом +speedblock.slab2.tooltip=Вы бегаете немного быстрее на этом +manual1.tooltip=\u00a7oBy: Skyla +manual2.tooltip=\u00a7oBy: Skyla +manual3.tooltip=\u00a7oBy: Thruul M'gon +searedtank1.tooltip=Содержит +searedtank2.tooltip=Сохраняет любые имеющиеся жидкости, когда собирает их +oreberries1.tooltip=Сладкое железо +oreberries2.tooltip=Чистый блеск +oreberries3.tooltip=На вкус как металл +oreberries4.tooltip=Оловянный человек +oreberries5.tooltip=Белый шоколад +oreberries6.tooltip=На вкус как крипер +hearthcanister1.tooltip=Crafting Item +hearthcanister2.tooltip=Crafting Item +hearthcanister3.tooltip=Часть низкоуровневых лечащих жестяных коробок +hearthcanister4.tooltip=Аксессуар +hearthcanister5.tooltip=Постоянное увеличение здоровья +landmine1.tooltip=со всем +landmine2.tooltip=мобами, игроками и красным камнем +landmine3.tooltip=игроками и красным камнем +landmine4.tooltip=только с красным камнем +goldenhead1.tooltip=\u00a75\u00a7oНекоторые говорят, что употребление головы +goldenhead2.tooltip=\u00a75\u00a7oпавшего врага укрепляет кровь +oreberrybush1.tooltip=Сладкое железо +oreberrybush2.tooltip=Чистый блеск +oreberrybush3.tooltip=На вкус как металл +oreberrybush4.tooltip=Оловянный человек +oreberrybush5.tooltip=Белый шоколад +oreberrybush6.tooltip=На вкус как крипер +barricade.tooltip=Stacks up to 4 times +pattern1.tooltip=Material Cost: +pattern2.tooltip=Material Cost: +potionlauncher.tooltip=Тестовый предмет From 0354ce09f14f9f606be25a79cd3d838a12cd7b0b Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Sat, 23 Nov 2013 16:21:40 +0000 Subject: [PATCH 07/11] Make horse melting configurable. For the overzealous, the vegetarian and the squeemish. The setting is in Experimental. --- src/tconstruct/blocks/logic/SmelteryLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tconstruct/blocks/logic/SmelteryLogic.java b/src/tconstruct/blocks/logic/SmelteryLogic.java index 0f526e9b..a64fd19b 100644 --- a/src/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/tconstruct/blocks/logic/SmelteryLogic.java @@ -349,7 +349,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci else if (o instanceof EntityHorse) { EntityHorse horse = (EntityHorse) o; - if (horse.attackEntityFrom(new SmelteryDamageSource(), 5)) + if (PHConstruct.meltableHorses && horse.attackEntityFrom(new SmelteryDamageSource(), 5)) { if (currentLiquid + 200 < maxLiquid) { From 5d4ed1842dc580eaf2055da40deb858cf890ec8d Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Sat, 23 Nov 2013 16:26:38 +0000 Subject: [PATCH 08/11] Update en_US.lang Forgot a few localisations. --- resources/assets/tinker/lang/en_US.lang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 9591e468..b2be3937 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -119,6 +119,7 @@ tile.cloth.red.slab.name=Red Wool Slab tile.cloth.black.slab.name=Black Wool Slab tile.GlueBlock.name=Glue Block +tile.liquid.glue.name=Glue item.oreberry.iron.name=Iron Oreberry item.oreberry.gold.name=Gold Oreberry @@ -244,6 +245,7 @@ item.tconstruct.Materials.AlumiteNugget.name=Alumite Nugget item.tconstruct.Materials.SteelNugget.name=Steel Nugget item.tconstruct.Materials.PigIronIngot.name=Pig Iron Ingot item.tconstruct.Materials.PigIronNugget.name=Pig Iron Platter +item.tconstruct.Materials.GlueIngot.name=Glue Ingot item.tconstruct.ArmorPattern.helmet.name=Helmet Cast item.tconstruct.ArmorPattern.chestplate.name=Chestplate Cast From a4838078f2a2f3c539b954b88761ffbc632c1892 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 23 Nov 2013 19:35:48 +0300 Subject: [PATCH 09/11] Update ru_RU.lang And again --- resources/assets/tinker/lang/ru_RU.lang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/assets/tinker/lang/ru_RU.lang b/resources/assets/tinker/lang/ru_RU.lang index 6837be6c..5a2d7846 100644 --- a/resources/assets/tinker/lang/ru_RU.lang +++ b/resources/assets/tinker/lang/ru_RU.lang @@ -119,6 +119,7 @@ tile.cloth.red.slab.name=Плита из красной шерсти tile.cloth.black.slab.name=Плита из чёрной шерсти tile.GlueBlock.name=Блок клея +tile.liquid.glue.name=Клей item.oreberry.iron.name=Кусочки железа item.oreberry.gold.name=Кусочки золота @@ -222,6 +223,7 @@ item.tconstruct.Materials.AlumiteNugget.name=Алюмитовый самород item.tconstruct.Materials.SteelNugget.name=Кусочек стали item.tconstruct.Materials.PigIronIngot.name=Чугунный слиток item.tconstruct.Materials.PigIronNugget.name=Чугунная тарелка +item.tconstruct.Materials.GlueIngot.name=Слиток клея item.tconstruct.ArmorPattern.helmet.name=Слепок шлема item.tconstruct.ArmorPattern.chestplate.name=Слепок кирасы From 2db60ea8a1a7cf42997d4d1cc58d1fbf95cd512e Mon Sep 17 00:00:00 2001 From: TheVikingWarrior Date: Sat, 23 Nov 2013 19:15:56 +0100 Subject: [PATCH 10/11] Update it_IT.lang --- resources/assets/tinker/lang/it_IT.lang | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/assets/tinker/lang/it_IT.lang b/resources/assets/tinker/lang/it_IT.lang index 0562e0fb..23a7ee9b 100644 --- a/resources/assets/tinker/lang/it_IT.lang +++ b/resources/assets/tinker/lang/it_IT.lang @@ -118,6 +118,9 @@ tile.cloth.green.slab.name=Lastra di Lana Verde tile.cloth.red.slab.name=Lastra di Lana Rossa tile.cloth.black.slab.name=Lastra di Lana Nera +tile.GlueBlock.name=Blocco di Colla +tile.liquid.glue.name=Colla + item.oreberry.iron.name=Baccagrezza di Ferro item.oreberry.gold.name=Baccagrezza d'Oro item.oreberry.copper.name=Baccagrezza di Rame @@ -241,6 +244,7 @@ item.tconstruct.Materials.AlumiteNugget.name=Pepita di Alumite item.tconstruct.Materials.SteelNugget.name=Pepita d'Acciaio item.tconstruct.Materials.PigIronIngot.name=Lingotto di Ferro Suino item.tconstruct.Materials.PigIronNugget.name=Piatto di Ferro Suino +item.tconstruct.Materials.GlueIngot.name=Lingotto di Colla item.tconstruct.helmetWood.name=Elmo di Legno item.tconstruct.chestplateWood.name=Corazza di Legno @@ -411,6 +415,7 @@ item.tconstruct.bucket.Electrum.name=Secchio di Elettro Fuso item.tconstruct.bucket.Ender.name=Secchio di Ender Liquefatto item.tconstruct.bucket.Slime.name=Secchio di Slime Liquido item.tconstruct.bucket.PigIron.name==Secchio di Ferro Suino Fuso +item.tconstruct.bucket.Glue.name=Secchio di Colla Appiccicosa item.tconstruct.bowstring.string.name=Corda d'Arco item.tconstruct.bowstring.enchantedfabriI donc.name=Corda d'Arco Incantato From 84e39568f6da61ceaa7923858a140fd6b131afe4 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Sun, 24 Nov 2013 00:48:38 +0000 Subject: [PATCH 11/11] Fix Glue IDs (Probably) Don't have access to an IDE; another dev can correct it if *this* is wrong too. --- src/tconstruct/util/config/PHConstruct.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 71d2dc31..a0bb621d 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -133,7 +133,9 @@ public class PHConstruct moltenEmerald = config.getBlock("Molten Emerald", 3216).getInt(3216); blood = config.getBlock("Liquid Cow", 3217).getInt(3217); moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218); - + + glueBlock = config.getBlock("Glue Block", 3219).getInt(3219); + glueFluidBlock = config.getBlock("Glue Fluid Block", 3220).getInt(3220); // signalBus = config.getBlock("Signal Bus", 3221).getInt(3221); // signalTerminal = config.getBlock("Signal Terminal", 3222).getInt(3222); @@ -162,8 +164,6 @@ public class PHConstruct woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243); woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244); woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); - glueBlock = config.getBlock("Glue Block", 3256).getInt(3256); - glueFluidBlock = config.getBlock("Glue Fluid Block", 3257).getInt(3257); castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235);