diff --git a/assets/tinker/lang/de_DE.xml b/assets/tinker/lang/de_DE.xml index 3d0cbf73..ac95d1d5 100644 --- a/assets/tinker/lang/de_DE.xml +++ b/assets/tinker/lang/de_DE.xml @@ -278,6 +278,7 @@ Bogensehne Verzauberte Bogensehne + Feurige Bogensehne Federne Befiederung Blätterne Befiederung Schleimige Befiederung @@ -316,30 +317,30 @@ Bogensehne Verzauberte Bogensehne - Geschmolzenes Eisen - Geschmolzenes Gold - Geschmolzenes Kupfer - Geschmolzenes Zinn - Geschmolzenes Aluminium - Geschmolzenes Cobalt - Geschmolzenes Ardit - Geschmolzene Bronze - Geschmolzenes Duraluminium - Geschmolzenes Manyullyn - Geschmolzenes Alumit - Geschmolzenes Obsidian - Geschmolzener Stahl - Geschmolzenes Glas - Versengtes Gestein - Verflüssigter Smaragd - Blut - Geschmolzenes Nickel - Geschmolzenes Silber - Geschmolzenes Blei - Geschmolzenes Platin - Geschmolzenes Invar - Geschmolzenes Elektrum - Verflüssigtes Ender + Geschmolzenes Eisen + Geschmolzenes Gold + Geschmolzenes Kupfer + Geschmolzenes Zinn + Geschmolzenes Aluminium + Geschmolzenes Cobalt + Geschmolzenes Ardit + Geschmolzene Bronze + Geschmolzenes Duraluminium + Geschmolzenes Manyullyn + Geschmolzenes Alumit + Geschmolzenes Obsidian + Geschmolzener Stahl + Geschmolzenes Glas + Versengtes Gestein + Verflüssigter Smaragd + Blut + Geschmolzenes Nickel + Geschmolzenes Silber + Geschmolzenes Blei + Geschmolzenes Platin + Geschmolzenes Invar + Geschmolzenes Elektrum + Verflüssigtes Ender Verzierter Apfel Essbarer Schleim @@ -355,13 +356,56 @@ Blauer Schleim Königsschleim Guardeschleim - Guardeschleim Rüstungs-GUI + Lade Capes neu %1$s wurde in eine Proteinmasse verwandelt %1$s ist mit der Schmelzerei eins geworden %1$s wird ein Meilenstein für unsere Revolution sein! %1$s dachte, das Schwimmen in heißen Flüssigkeiten wäre eine gute Idee + + Holz - + Stein - + Eisen - + Feuterstein - + Kaktus - + Knochen - + Obsidian - + Schleim - + Papier - + Cobalt - + Ardit - + Manyullyn - + Kupfer - + Bronze - + Alumit - + Stahl - + Schleim - + + Geschmolzenes Eisen + Geschmolzenes Gold + Geschmolzenes Kupfer + Geschmolzenes Zinn + Geschmolzenes Aluminum + Geschmolzenes Cobalt + Geschmolzenes Ardit + Geschmolzene Bronze + Geschmolzenes Duraluminium + Geschmolzenes Manyullyn + Geschmolzenes Alumit + Geschmolzenes Obsidian + Geschmolzener Stahl + Geschmolzenes Glas + Versengtes Gestein + Verflüssigter Smaragd + Blut + Geschmolzenes Nickel + Geschmolzenes Blei + Geschmolzenes Silber + Geschmolzenes Platin + Geschmolzenes Invar + Geschmolzenes Elektrum + Flüssiges Ender - \ No newline at end of file + diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml index d44f591c..484293be 100644 --- a/assets/tinker/lang/en_US.xml +++ b/assets/tinker/lang/en_US.xml @@ -277,6 +277,7 @@ Bowstring Enchanted Bowstring + Fiery Bowstring Feather Fletching Leaf Fletching Slime Fletching @@ -315,30 +316,30 @@ Bowstring Enchanted Bowstring - Molten Iron - Molten Gold - Molten Copper - Liquid Tin - Molten Aluminum - Molten Cobalt - Molten Ardite - Molten Bronze - Molten Aluminum Brass - Molten Manyullyn - Molten Alumite - Molten Obsidian - Molten Steel - Molten Glass - Seared Stone - Liquified Emerald - Blood - Molten Nickel - Molten Silver - Molten Lead - Molten Shiny - Molten Invar - Molten Electrum - Liquified Ender + Molten Iron + Molten Gold + Molten Copper + Liquid Tin + Molten Aluminum + Molten Cobalt + Molten Ardite + Molten Bronze + Molten Aluminum Brass + Molten Manyullyn + Molten Alumite + Molten Obsidian + Molten Steel + Molten Glass + Seared Stone + Liquified Emerald + Blood + Molten Nickel + Molten Silver + Molten Lead + Molten Shiny + Molten Invar + Molten Electrum + Liquified Ender Jeweled Apple Gelatinous Slime @@ -356,6 +357,7 @@ Gardeslime Armor Gui + Reload Capes %1$s transformed into Soylent Green %1$s has fused with the Smeltery @@ -405,4 +407,4 @@ Molten Shiny Liquid Ender - \ No newline at end of file + diff --git a/assets/tinker/lang/ru_RU.xml b/assets/tinker/lang/ru_RU.xml index 1632c989..ba26c2ee 100644 --- a/assets/tinker/lang/ru_RU.xml +++ b/assets/tinker/lang/ru_RU.xml @@ -54,7 +54,7 @@ Дорога из грубого бурого песчаника Бурый песчаник Кирпич из бурого песчаника - Дорога из бурго песчаника + Дорога из бурого песчаника Красивый бурый песчаник Резной бурый песчаник @@ -98,6 +98,23 @@ Каменная дорого Кирпич из красивого камня + Плита из шерсти + Плита из оранжевой шерсти + Плита из сиреневой шерсти + Плита из светло-синей шерсти + Плита из жёлтой шерсти + Плита из лаймовой шерсти + Плита из розовой шерсти + Плита из серой шерсти + Плита светло-серой шерсти + Плита из бирюзовой шерсти + Плита из фиолетовой шерсти + Плита из синей шерсти + Плита из коричневой шерсти + Плита из зелёной шерсти + Плита из красной шерсти + Плита из чёрной шерсти + Кусочки железа Кусочки золота Кусочки меди @@ -133,6 +150,8 @@ Алюминиевый самородок Кристалл эссенции Самородок алюминиевой латуни + Шёлковистая ткань + Шёлковистая драгоценность Обсидиановый самородок Кобальтовый самородок Ардитовый самородок @@ -141,6 +160,8 @@ Алюмитовый самородок Кусочек стали + Кристалл эссенции + Контроллер плавильни Водосток плавильни Обожжённые кирпичи @@ -160,6 +181,12 @@ Разводной мост Воспламенитель Фугас + Колышек + Баррикада из дуба + Баррикада из ели + Баррикада из берёзы + Баррикада из тропического дерева + Экстрактор эссенции Кобальтовый блок Ардитовый блок @@ -171,8 +198,10 @@ Блок алюминиевой латуни Алюмитовый блок Стальной блок + Блок твёрдого эндера Факел + Станция крафта Чистое стекло Душевное стекло @@ -233,6 +262,15 @@ Плита из кладбищенской почвы Плита из священной почвы + Земля из синей слизи + Листва слизи + Слизистый саженец + Слизистая трава + Слизистая трава + Слизистая трава + Застывшая синяя слизь + Застывшая зелёная слизь + Ранец Пустая схема Чистый чугун @@ -265,6 +303,14 @@ Ведро расплавленного обожжённого камня Ведро сжиженного изумруда Ведро крови + Ведро расплавленного никеля + Ведро расплавленного свинца + Ведро расплавленного серебра + Ведро расплавленного блеска + Ведро расплавленного инвара + Ведро расплавленного электрума + Ведро сжиженного эндера + Ведро жидкой слизи Тетива Зачарованная тетива @@ -285,14 +331,21 @@ Расплавленное стекло Расплавленный обожжённый камень Сжиженный изумруд - Кровь + Кровь + Расплавленный никель + Расплавленное серебро + Расплавленный свинец + Расплавленный блеск + Расплавленный инвар + Расплавленный электрум + Сжиженный эндер Драгоценное яблоко Желатиновая слизь Пустая жестяная коробка Миниатюрное красное сердце Лечащая жестяная коробка - Dirtmover Gloves + Перчатки для перемещения земли Литейный стол Seared Faucet @@ -300,35 +353,39 @@ Синий слизень Король слизней - Слизень охраник + Слизень охраник Armor Gui + Перезагрузить плащи %1$s превратился в зелёный сойлент %1$s сплавился с плавильней %1$s станет ступенькой в нашей революции! %1$s думал, что купание в горячих жидкостях хорошая идея - %1$s наблюдал за тем как его ноги взорвались - %1$s был обречён на смерть от мины - %1$s взял поездку на фейерверк - - Wooden - Stone - Iron - Flint - Cactus - Bone - Obsidian - Slime - Paper - Cobalt - Ardite - Manyullyn - Copper - Bronze - Alumite - Steel - Slime + Расплавленное железо + Расплавленное золото + Расплавленная медь + Расплавленное олово + Расплавленный алюминий + Расплавленный кобальт + Расплавленный ардит + Расплавленная бронза + Расплавленная алюминиевая латунь + Расплавленный мануллин + Расплавленный алюмит + Расплавленный обсидиан + Расплавленная сталь + Расплавленное стекло + Обожжённый камень + Сжиженный изумруд + Кровь + Расплавленный никель + Расплавленный свинец + Расплавленное серебро + Расплавленная платина + Расплавленный инвар + Расплавленный блеск + Жидкий эндер diff --git a/assets/tinker/lang/zh_CN.xml b/assets/tinker/lang/zh_CN.xml index 268a5690..1ca5300d 100644 --- a/assets/tinker/lang/zh_CN.xml +++ b/assets/tinker/lang/zh_CN.xml @@ -271,23 +271,23 @@ 弓弦 附魔弓弦 - 液态铁 - 液态黄金 - 液态铜 - 液态锡 - 液态铝 - 液态钴 - 液态阿迪特 - 液态青铜 - 液态含铝黄铜 - 液态玛玉灵 - 液态耐酸铝 - 液态黑曜石 - 液态钢 - 液态玻璃 - 熔融石头 - 液态绿宝石 - 血 + 液态铁 + 液态黄金 + 液态铜 + 液态锡 + 液态铝 + 液态钴 + 液态阿迪特 + 液态青铜 + 液态含铝黄铜 + 液态玛玉灵 + 液态耐酸铝 + 液态黑曜石 + 液态钢 + 液态玻璃 + 熔融石头 + 液态绿宝石 + 血 宝石苹果 胶状黏液 @@ -302,7 +302,7 @@ 蓝色史莱姆 史莱姆王 - 史莱姆护卫 + 史莱姆护卫 装备界面 @@ -311,10 +311,6 @@ %1$s将成为我们革命的垫脚石! %1$s认为在炽热的液体中游泳是个不错的注意! - %1$s眼看着他们的腿被炸飞了! - %1$s被地雷炸死了! - %1$s骑着烟花火箭飞上了西天! - 木 石 铁 diff --git a/assets/tinker/textures/items/parts/flamestring_bowstring.png b/assets/tinker/textures/items/parts/flamestring_bowstring.png new file mode 100644 index 00000000..b9dd5049 Binary files /dev/null and b/assets/tinker/textures/items/parts/flamestring_bowstring.png differ diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring.png new file mode 100644 index 00000000..1011b681 Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring.png differ diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring_1.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring_1.png new file mode 100644 index 00000000..db8d190d Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring_1.png differ diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring_2.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring_2.png new file mode 100644 index 00000000..89d92080 Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring_2.png differ diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring_3.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring_3.png new file mode 100644 index 00000000..9595fa27 Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring_3.png differ diff --git a/assets/tinker/textures/items/shortbow/flamestring_bowstring_broken.png b/assets/tinker/textures/items/shortbow/flamestring_bowstring_broken.png new file mode 100644 index 00000000..efb10460 Binary files /dev/null and b/assets/tinker/textures/items/shortbow/flamestring_bowstring_broken.png differ diff --git a/tconstruct/client/TControls.java b/tconstruct/client/TControls.java index a9e1bd66..e55222fe 100644 --- a/tconstruct/client/TControls.java +++ b/tconstruct/client/TControls.java @@ -8,6 +8,8 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.settings.KeyBinding; import net.minecraft.network.packet.Packet250CustomPayload; + +import tconstruct.client.event.EventCloakRender; import tconstruct.client.tabs.TabRegistry; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.network.PacketDispatcher; @@ -17,6 +19,7 @@ public class TControls extends TKeyHandler //static KeyBinding grabKey = new KeyBinding("key.grab", 29); //static KeyBinding stiltsKey = new KeyBinding("key.stilts", 46); public static KeyBinding armorKey = new KeyBinding("key.tarmor", 24); + public static KeyBinding refreshCapes = new KeyBinding("key.tcapes.reload", 88); static KeyBinding jumpKey; static KeyBinding invKey; static Minecraft mc; @@ -33,7 +36,7 @@ public class TControls extends TKeyHandler public TControls() { - super(new KeyBinding[] { armorKey }, new boolean[] { false}, getVanillaKeyBindings(), + super(new KeyBinding[] { armorKey, refreshCapes }, new boolean[] { false, false }, getVanillaKeyBindings(), new boolean[] { false, false }); //System.out.println("Controls registered"); } @@ -65,6 +68,9 @@ public class TControls extends TKeyHandler { TabRegistry.addTabsToInventory((GuiContainer) mc.currentScreen); } + if (kb == refreshCapes && mc.currentScreen == null){ + EventCloakRender.instance.refreshCapes(); + } /*if (kb == jumpKey) //Double jump { if (jumping && !doubleJump) diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java index b75051a3..51b3eb95 100644 --- a/tconstruct/client/TProxyClient.java +++ b/tconstruct/client/TProxyClient.java @@ -823,7 +823,7 @@ public class TProxyClient extends TProxyCommon } } - String[] bowstringTypes = { "string", "magicfabric" }; + String[] bowstringTypes = { "string", "magicfabric", "flamestring" }; for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++) { TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true); diff --git a/tconstruct/client/event/EventCloakRender.java b/tconstruct/client/event/EventCloakRender.java index 4889960b..d5a5765f 100644 --- a/tconstruct/client/event/EventCloakRender.java +++ b/tconstruct/client/event/EventCloakRender.java @@ -4,7 +4,7 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.*; import java.net.*; -import java.util.HashMap; +import java.util.*; import javax.swing.ImageIcon; @@ -19,9 +19,13 @@ public class EventCloakRender { private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics(); private HashMap cloaks = new HashMap(); + private ArrayList capePlayers = new ArrayList(); + + public static EventCloakRender instance; public EventCloakRender(){ buildCloakURLDatabase(); + instance = this; } @ForgeSubscribe @@ -29,13 +33,15 @@ public class EventCloakRender { if(event.entityPlayer instanceof AbstractClientPlayer){ AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer)event.entityPlayer; - if (abstractClientPlayer.func_110310_o().field_110560_d == null) { + if (!capePlayers.contains(abstractClientPlayer)) { String cloakURL = cloaks.get(event.entityPlayer.username); if(cloakURL == null){ return; } + capePlayers.add(abstractClientPlayer); + abstractClientPlayer.func_110310_o().field_110559_g = false; new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); event.renderCape = true; @@ -114,4 +120,10 @@ public class EventCloakRender { } } } + + public void refreshCapes(){ + cloaks.clear(); + capePlayers.clear(); + buildCloakURLDatabase(); + } } diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index a1ecc7c4..f7610d36 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -1,216 +1,48 @@ package tconstruct.common; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; +import java.util.*; + +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.registry.*; -import net.minecraft.block.Block; -import net.minecraft.block.BlockDispenser; -import net.minecraft.block.StepSound; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialLiquid; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; import tconstruct.TConstruct; -import tconstruct.blocks.Aggregator; -import tconstruct.blocks.CraftingSlab; -import tconstruct.blocks.CraftingStationBlock; -import tconstruct.blocks.DryingRack; -import tconstruct.blocks.EquipBlock; -import tconstruct.blocks.EssenceExtractor; -import tconstruct.blocks.GlassBlockConnected; -import tconstruct.blocks.GlassBlockConnectedMeta; -import tconstruct.blocks.GlassPane; -import tconstruct.blocks.GlassPaneStained; -import tconstruct.blocks.GravelOre; -import tconstruct.blocks.LavaTankBlock; -import tconstruct.blocks.LightCrystalBase; -import tconstruct.blocks.LiquidMetalFinite; -import tconstruct.blocks.MeatBlock; -import tconstruct.blocks.MetalOre; -import tconstruct.blocks.MultiBrick; -import tconstruct.blocks.MultiBrickFancy; -import tconstruct.blocks.OreberryBush; -import tconstruct.blocks.OreberryBushEssence; -import tconstruct.blocks.RedstoneMachine; -import tconstruct.blocks.SearedBlock; -import tconstruct.blocks.SearedSlab; -import tconstruct.blocks.SlabBase; -import tconstruct.blocks.SmelteryBlock; -import tconstruct.blocks.SoilBlock; -import tconstruct.blocks.SpeedBlock; -import tconstruct.blocks.SpeedSlab; -import tconstruct.blocks.StoneTorch; -import tconstruct.blocks.TMetalBlock; -import tconstruct.blocks.ToolForgeBlock; -import tconstruct.blocks.ToolStationBlock; -import tconstruct.blocks.logic.CastingBasinLogic; -import tconstruct.blocks.logic.CastingTableLogic; -import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.blocks.logic.DrawbridgeLogic; -import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.blocks.logic.EssenceExtractorLogic; -import tconstruct.blocks.logic.FaucetLogic; -import tconstruct.blocks.logic.FirestarterLogic; -import tconstruct.blocks.logic.FrypanLogic; -import tconstruct.blocks.logic.GlowstoneAggregator; -import tconstruct.blocks.logic.LavaTankLogic; -import tconstruct.blocks.logic.MultiServantLogic; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.blocks.logic.SmelteryDrainLogic; -import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.blocks.logic.StencilTableLogic; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.blocks.slime.SlimeFluid; -import tconstruct.blocks.slime.SlimeGel; -import tconstruct.blocks.slime.SlimeGrass; -import tconstruct.blocks.slime.SlimeLeaves; -import tconstruct.blocks.slime.SlimeSapling; -import tconstruct.blocks.slime.SlimeTallGrass; -import tconstruct.blocks.traps.BarricadeBlock; -import tconstruct.blocks.traps.Punji; +import tconstruct.blocks.*; +import tconstruct.blocks.logic.*; +import tconstruct.blocks.slime.*; +import tconstruct.blocks.traps.*; import tconstruct.client.StepSoundSlime; -import tconstruct.entity.Automaton; -import tconstruct.entity.BlueSlime; -import tconstruct.entity.Crystal; -import tconstruct.entity.FancyEntityItem; -import tconstruct.entity.MiniGardy; -import tconstruct.entity.SlimeClone; -import tconstruct.entity.projectile.ArrowEntity; -import tconstruct.entity.projectile.DaggerEntity; -import tconstruct.entity.projectile.LaunchedPotion; -import tconstruct.items.Bowstring; -import tconstruct.items.CraftingItem; -import tconstruct.items.DiamondApple; -import tconstruct.items.EssenceCrystal; -import tconstruct.items.FilledBucket; -import tconstruct.items.Fletching; -import tconstruct.items.GoldenHead; -import tconstruct.items.Manual; -import tconstruct.items.MaterialItem; -import tconstruct.items.MetalPattern; -import tconstruct.items.OreBerries; -import tconstruct.items.Pattern; -import tconstruct.items.StrangeFood; -import tconstruct.items.TitleIcon; -import tconstruct.items.ToolPart; -import tconstruct.items.ToolPartHidden; -import tconstruct.items.ToolShard; -import tconstruct.items.armor.Glove; -import tconstruct.items.armor.HeartCanister; -import tconstruct.items.armor.Knapsack; -import tconstruct.items.armor.TArmorBase; -import tconstruct.items.blocks.BarricadeItem; -import tconstruct.items.blocks.CraftedSoilItemBlock; -import tconstruct.items.blocks.CraftingSlabItemBlock; -import tconstruct.items.blocks.GlassBlockItem; -import tconstruct.items.blocks.GlassPaneItem; -import tconstruct.items.blocks.GravelOreItem; -import tconstruct.items.blocks.LavaTankItemBlock; -import tconstruct.items.blocks.LightCrystalItem; -import tconstruct.items.blocks.MetalItemBlock; -import tconstruct.items.blocks.MetalOreItemBlock; -import tconstruct.items.blocks.MultiBrickFancyItem; -import tconstruct.items.blocks.MultiBrickItem; -import tconstruct.items.blocks.OreberryBushItem; -import tconstruct.items.blocks.OreberryBushSecondItem; -import tconstruct.items.blocks.RedstoneMachineItem; -import tconstruct.items.blocks.SearedSlabItem; -import tconstruct.items.blocks.SearedTableItemBlock; -import tconstruct.items.blocks.SlimeGelItemBlock; -import tconstruct.items.blocks.SlimeGrassItemBlock; -import tconstruct.items.blocks.SlimeLeavesItemBlock; -import tconstruct.items.blocks.SlimeSaplingItemBlock; -import tconstruct.items.blocks.SlimeTallGrassItem; -import tconstruct.items.blocks.SmelteryItemBlock; -import tconstruct.items.blocks.SpeedBlockItem; -import tconstruct.items.blocks.SpeedSlabItem; -import tconstruct.items.blocks.StainedGlassClearItem; -import tconstruct.items.blocks.StainedGlassClearPaneItem; -import tconstruct.items.blocks.ToolForgeItemBlock; -import tconstruct.items.blocks.ToolStationItemBlock; -import tconstruct.items.blocks.WoolSlab1Item; -import tconstruct.items.blocks.WoolSlab2Item; -import tconstruct.items.tools.Arrow; -import tconstruct.items.tools.BattleSign; -import tconstruct.items.tools.Battleaxe; -import tconstruct.items.tools.Broadsword; -import tconstruct.items.tools.Chisel; -import tconstruct.items.tools.Cleaver; -import tconstruct.items.tools.Cutlass; -import tconstruct.items.tools.Dagger; -import tconstruct.items.tools.Excavator; -import tconstruct.items.tools.FryingPan; -import tconstruct.items.tools.Hammer; -import tconstruct.items.tools.Hatchet; -import tconstruct.items.tools.Longsword; -import tconstruct.items.tools.LumberAxe; -import tconstruct.items.tools.Mattock; -import tconstruct.items.tools.Pickaxe; -import tconstruct.items.tools.PotionLauncher; -import tconstruct.items.tools.Rapier; -import tconstruct.items.tools.Scythe; -import tconstruct.items.tools.Shortbow; -import tconstruct.items.tools.Shovel; +import tconstruct.entity.*; +import tconstruct.entity.projectile.*; +import tconstruct.items.*; +import tconstruct.items.armor.*; +import tconstruct.items.blocks.*; +import tconstruct.items.tools.*; import tconstruct.landmine.block.BlockLandmine; import tconstruct.landmine.item.ItemBlockLandmine; import tconstruct.landmine.tileentity.TileEntityLandmine; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.crafting.Detailing; -import tconstruct.library.crafting.DryingRackRecipes; -import tconstruct.library.crafting.LiquidCasting; -import tconstruct.library.crafting.PatternBuilder; -import tconstruct.library.crafting.Smeltery; -import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.crafting.*; import tconstruct.library.tools.ToolCore; import tconstruct.library.util.IPattern; -import tconstruct.modifiers.ModAntiSpider; -import tconstruct.modifiers.ModAttack; -import tconstruct.modifiers.ModAutoSmelt; -import tconstruct.modifiers.ModBlaze; -import tconstruct.modifiers.ModButtertouch; -import tconstruct.modifiers.ModDurability; -import tconstruct.modifiers.ModElectric; -import tconstruct.modifiers.ModExtraModifier; -import tconstruct.modifiers.ModInteger; -import tconstruct.modifiers.ModLapis; -import tconstruct.modifiers.ModPiston; -import tconstruct.modifiers.ModRedstone; -import tconstruct.modifiers.ModReinforced; -import tconstruct.modifiers.ModRepair; -import tconstruct.modifiers.ModSmite; -import tconstruct.modifiers.TActiveOmniMod; -import tconstruct.util.PHConstruct; -import tconstruct.util.RecipeRemover; -import tconstruct.util.TDispenserBehaviorSpawnEgg; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; +import tconstruct.modifiers.*; +import tconstruct.util.*; + +import net.minecraft.block.*; +import net.minecraft.block.material.*; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.*; +import net.minecraft.item.crafting.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.*; +import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.oredict.*; public class TContent implements IFuelHandler { @@ -2145,6 +1977,13 @@ public class TContent implements IFuelHandler { System.out.println("[TConstruct] Thaumcraft not detected."); } + + if(Loader.isModLoaded("Natura")){ + try{ + Object plantItem = getStaticItem("plantItem", "mods.natura.common.NContent"); + TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item)plantItem, 1, 7), new ItemStack(bowstring, 1, 2), 1.2F, 0.8F, 1.3f); + }catch(Exception e){} //No need to handle + } ItemStack ingotcast = new ItemStack(metalPattern, 1, 0); LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); diff --git a/tconstruct/items/Bowstring.java b/tconstruct/items/Bowstring.java index d43e1ec6..bab04b75 100644 --- a/tconstruct/items/Bowstring.java +++ b/tconstruct/items/Bowstring.java @@ -2,11 +2,14 @@ package tconstruct.items; import java.util.List; +import cpw.mods.fml.common.Loader; + import tconstruct.common.TContent; import tconstruct.library.util.IToolPart; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; public class Bowstring extends CraftingItem implements IToolPart { @@ -30,9 +33,9 @@ public class Bowstring extends CraftingItem implements IToolPart return names; } - public static final String[] toolMaterialNames = new String[] { "string", "enchantedfabric" }; + public static final String[] toolMaterialNames = new String[] { "string", "enchantedfabric", "flamestring" }; - public static final String[] toolTextureNames = new String[] { "string", "magicfabric" }; + public static final String[] toolTextureNames = new String[] { "string", "magicfabric", "flamestring" }; @Override public int getMaterialID (ItemStack stack) @@ -45,5 +48,7 @@ public class Bowstring extends CraftingItem implements IToolPart list.add(new ItemStack(id, 1, 0)); if (TContent.thaumcraftAvailable) list.add(new ItemStack(id, 1, 1)); + if (Loader.isModLoaded("Natura")) + list.add(new ItemStack(id, 1, 2)); } } diff --git a/tconstruct/landmine/block/BlockLandmine.java b/tconstruct/landmine/block/BlockLandmine.java index 40b3042a..edb4da72 100644 --- a/tconstruct/landmine/block/BlockLandmine.java +++ b/tconstruct/landmine/block/BlockLandmine.java @@ -57,7 +57,7 @@ public class BlockLandmine extends BlockContainer { @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - if (world.getBlockTileEntity(x, y, z) instanceof TileEntityLandmine) { + if (world.getBlockId(x, y, z) == this.blockID && world.getBlockTileEntity(x, y, z) instanceof TileEntityLandmine) { TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z); if (te != null) {