From fe5478af8b9e481330767f85b0ccda154cf88552 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 13 Sep 2015 15:55:57 +0300 Subject: [PATCH] Hardcoded console logging, readme.md --- .gitignore | 1 - Changelog.txt | 133 ------------------ README.md | 22 +++ .../tombenpotter/emt/ElectroMagicTools.java | 23 ++- .../emt/common/RecipeRegistry.java | 7 +- .../emt/common/util/EventHandlerEMT.java | 2 +- .../assets/electromagictools/lang/en_US.lang | 27 +--- .../assets/electromagictools/lang/ru_RU.lang | 28 +--- .../assets/electromagictools/lang/zh_CN.lang | 27 +--- src/main/resources/{emt.png => logo.png} | Bin src/main/resources/mcmod.info | 4 +- 11 files changed, 42 insertions(+), 232 deletions(-) delete mode 100644 Changelog.txt create mode 100644 README.md rename src/main/resources/{emt.png => logo.png} (100%) diff --git a/.gitignore b/.gitignore index ff5c98e..c85ec15 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,6 @@ #Specific files MCFPost.txt -Thumbs.db options.txt #Remove OS generated garbage diff --git a/Changelog.txt b/Changelog.txt deleted file mode 100644 index 0e95f43..0000000 --- a/Changelog.txt +++ /dev/null @@ -1,133 +0,0 @@ -Changelog of the mod : Electric Magic Tools, a Thaumcraft 4/Industrial-Craft 2 addon - --------------------------------------------------------------------------------------------------------------------------------------------------------- -Version 2.0.0Alpha-Build 29: -Hopefully no more duplicate packages or stuff. I hope. - -Version 2.0.0Alpha-Build 28: -Started updating changelog again. Oops :p -Fixed the TileEntities not getting registered. - -Version 2.0.0Alpa5: -Wild Material Shards have appeared! They are used in the tools' crafting recipes :D. -And here come the carvers! - -Version 2.0.0Alpha4: -Added some items to the vanilla module of the mod: Wooden, Stone, Iron, Golden and Diamond Drills. -Added Wooden, Stone, Iron, Golden and Diamond Chainsaws. -Added Iron, Golden and Diamond Omnitools. -Removed stuff from capes, it's not needed anymore. - -Version 2.0.0Alpha3: -Fixed the UU-Matter infusion research page crash. But the recipes aren't viable anymore, I'll get to fixing that ASAP. -Added a few Base tools, just for later purposes. -Added an interface for using in said tools, for later purposes too - -Version 2.0.0Aplha2: -Fixed the Electric/Nano/Qunatum Boots of the Traveller not preventing fall damage. They now drain energy when doing so. -Fixed the Wings not preventing fall damage. They just do it. -Fixed the Wings model being derpy (Finally, huzza!) - -Version 2.0.0Alpha1: -Since SOMEONE decided to change the modid, and almost everything else, this is now EMT 2.0.0. Hurray, and all that stuff. -Fixed the Essentia Generators crashing when placed in world. Oops. -And, well, as you can see, resumed the work on EMT. Sorry for the delay! :p - -Version 1.1.4 : -Updated to Minecraft version 1.7.10. -Rewrote and improved the Essentia Generator code. It's now very easy to add new ones. -Rewrote and improved the Solar Panel code. It's now very easy to add new ones. -Rewrote and improved the Drill, Chainsaw, Omnitool, Boot, Goggle and Wing code. It's now very easy to add new ones, as well as way more efficient. -Refactored a lot of the code in preparation for the modules. -Added a new Essentia Generator, the Aer Generator. -Added a tooltip to the current Essentia Generators, saying they will be removed in future versions. -Added an Essentia Generator, alongisde with a dynamic system calculating outputs linked to different essentias. Change the values of the primals in the config, and there is even a maximum cap! -Added localization text for almost everything. (TehNut) -Added config GUI for in game config changes. (Implemented by Tombenpotter, fixed by TehNut) -Fixed Charged Creepers and Tainted Chickens not dropping things. (TehNut) -Organized creative tab to make it look nicer (TehNut) -Compressed Solar Panel tooltips are now easier to read. (TehNut) - -Version 1.1.3 : -Added a logo to the mcmod.info, and fixed the version tag. - -Version 1.1.2 : -Fixed the Shield Block being broken by the wither. -Added Config GUIs. Regenerating the config file is HIGLY reccomended. -Moved the baubles API to package it with EMT, along with the @API annotation to prevent any issues. - -Version 1.1.1 : -Fixed a bug with The One Ring where mobs attacked you when you removed it while in creative. -New Thaumonomicon entries for a couple of things, thanks to Professor29. -Forgot to mention it, new Nanosuit Boots of the Traveller texture thanks to TehNut. -Removed Thaumium Plate and Lightning Summoner, and moved them to use other ids. This will delete existing ones. -Moved all the Solar Panels tooltips to require the use of the shift key to show themselves. -Adding wings, my take at the mix of Magic and Jetpacks. -Blacklist of the Etheral Processor now extends to anything containing armor, armour, helm, chestp, legging, boot, sword, shovel, axe or pick in its unlocalized name. -Added a drop to the Tainted Chicken, the Tainted Feather. Also added a crafting recipe for it. -Added a couple of crating components, used in the making of the wings. -Added a bunch of console outputs on the starting of the game so that I know exactly when it crashed if it died at startup. -Fixed a bug with the drill of the Rockbreaker that would make it use durability and eventually break when shift-breaking a block. -Added a different texture file for each solar panel, so that it can be changed more easily. - -CyanideX remade all the EMT textures! Finally featuring cool looking stuff! Yey, thanks a lot to him! - -Version 1.1.0 : -Updating to MC 1.7.2. -Added an Inventory Charging Bauble and an Armor Charging Bauble. -Added The One Ring, available only through dungeon loot. -Added a Wand Charging wand focus. - -Versions 1.0.9a, 1.0.9b, 1.0.9c, 1.0.9d : -Added a blacklist for the Ethereal Processor to anything that has "dust" in its OreDict entry. -Mainly bugfixes. - -Version 1.0.9 : -Fixed the bug with the Drill of the Rockbreaker. -Added UU-Matter Infusion Recipes. -Fixed the recipe for the Quantum Solar Helmet of Revealing. -Added the Wand Focus: Charging. -Added a cool particle effect existing when the Electric/Nano/Quantum boots of the traveller are worn (you an disable it in the config). -Added a portable node, and an Elecric Hoe of Growth. - -Version 1.0.8 : -Added some magical solar panels, different tiers and special abilities to all of them. - -Version 1.0.7 : -Updated to Thaumcraft 4.1.0x. - -Version 1.0.6 : -Added an Industrial Wand Charging Station. -Added some legendary tools. -A couple of other things. -Code wise, switching to Forge Gradle (#964). -Added some enhanced boots of the traveller, and capes for some friends and I. - -Version 1.0.5 : -Added some Ignis/Potentia/Auram generators. -Added Electric Goggles of revealing. -Added a Chainsaw of the Stream. -Added a Drill of the Rockbreaker. - -Version 1.0.4 : -Added the Kris-tmas Focus. -Added the Shield Focus - -Version 1.0.3b : -Second attempt to fix the server crash, it is again working in SMP. - -Version 1.0.3 : -Attempt to fix the server crash of the mod. Attempt failed. - -Version 1.0.2 : -Adds the Wand Focus : Laser. -Added a christmas easter egg. -Does not work on servers. - -Version 1.0.1 : -Fixes a crash due to the Omnitools. - -Version 1.0.0 : -First release of the mod. - --------------------------------------------------------------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..8cf222e --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +![](/src\main\resources\logo.png?raw=true) + +#Electro-Magic Tools + +Electro-Magic Tools is a Minecraft mod which integrates Thaumcraft 4 with IndustrialCraft 2 by adding cross-mod tools and items, such as magic solar panels, essentia generators and legendary items. + +#Downloads + +Github: + +https://github.com/fewizz/Electro-Magic-Tools/releases + +#Issues + +Before posting to the issue tracker, make sure you meet the following criteria: + +- You're using the latest version of EMT. +- You've made sure the version of Forge you're using is the one EMT has been compiled for. (Newer is usually OK, but be careful!) +- You've gone through the effort to isolate EMT from other mods that aren't related to the issue. +- You've gone through the effort to find what conditions are necessary to reproduce the issue. +- The issue is subtle enough and has been around long enough that you think we might have missed it. +- You speak English or Russian well enough to explain yourself without wondering whether you will be understood. \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/tombenpotter/emt/ElectroMagicTools.java index 2136aa5..f71e66c 100644 --- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java +++ b/src/main/java/tombenpotter/emt/ElectroMagicTools.java @@ -36,7 +36,6 @@ import tombenpotter.emt.common.entities.BaseEntityRegistry; import tombenpotter.emt.common.network.PacketEMTKeys; import tombenpotter.emt.common.util.*; import tombenpotter.emt.proxies.CommonProxy; -import static tombenpotter.emt.common.util.TextHelper.localize; @Mod(modid = ModInformation.modid, name = ModInformation.name, version = ModInformation.version, guiFactory = ModInformation.guiFactory, dependencies = ModInformation.depend) public class ElectroMagicTools { @@ -54,7 +53,7 @@ public class ElectroMagicTools { @EventHandler public void preInit(FMLPreInitializationEvent event) { - ElectroMagicTools.logger.info(localize("console.EMT.preInit.begin")); + ElectroMagicTools.logger.info(Starting planning the world domination); ConfigHandler.init(event.getSuggestedConfigurationFile()); FMLCommonHandler.instance().bus().register(new EventHandlerEMT()); @@ -63,36 +62,36 @@ public class ElectroMagicTools { EssentiasOutputs.addOutputs(); registerPackets(); - ElectroMagicTools.logger.info(localize("console.EMT.preInit.end")); + ElectroMagicTools.logger.info(Planning complete); } @EventHandler public void load(FMLInitializationEvent event) { - ElectroMagicTools.logger.info(localize("console.EMT.init.begin")); + ElectroMagicTools.logger.info(Gathering allies); - ElectroMagicTools.logger.info(localize("console.EMT.init.loadProxies")); + ElectroMagicTools.logger.info(Loading the proxies); proxy.load(); - ElectroMagicTools.logger.info(localize("console.EMT.init.mobDrops")); + ElectroMagicTools.logger.info(Making mobs drop additional items); MinecraftForge.EVENT_BUS.register(new EntityEventHandler()); - ElectroMagicTools.logger.info(localize("console.EMT.init.dungeon")); + ElectroMagicTools.logger.info(Adding dungeon loot); DungeonChestGenerator.generateLoot(); - ElectroMagicTools.logger.info(localize("console.EMT.init.entities")); + ElectroMagicTools.logger.info(Registering entities); BaseEntityRegistry.registerEMTEntities(); - ElectroMagicTools.logger.info(localize("console.EMT.init.guiHandler")); + ElectroMagicTools.logger.info(Registering the GUI Handler); NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy); - ElectroMagicTools.logger.info(localize("console.EMT.init.end")); + ElectroMagicTools.logger.info(Allies gathered.); } @EventHandler public void postInit(FMLPostInitializationEvent event) { - ElectroMagicTools.logger.info(localize("console.EMT.postInit.begin")); + ElectroMagicTools.logger.info(Starting the world takeover); Registry.registerLate(); RegistryHandler.registerIc2PostRegistrys(); - ElectroMagicTools.logger.info(localize("console.EMT.postInit.end")); + ElectroMagicTools.logger.info(World takeover complete. Enjoy!); } @EventHandler diff --git a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java index 379e75f..2259ed2 100644 --- a/src/main/java/tombenpotter/emt/common/RecipeRegistry.java +++ b/src/main/java/tombenpotter/emt/common/RecipeRegistry.java @@ -39,7 +39,6 @@ import tombenpotter.emt.common.items.ItemRegistry; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.CraftingAspects; import tombenpotter.emt.common.util.RandomHelper; -import tombenpotter.emt.common.util.TextHelper; import java.util.Iterator; @@ -61,7 +60,7 @@ public class RecipeRegistry { if (!Loader.isModLoaded("gregtech_addon")) { GameRegistry.addShapedRecipe(IC2Items.getItem("diamondDrill"), " Y ", "YXY", 'Y', new ItemStack(Items.diamond), 'X', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); } else { - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.modLoaded.GT")); + ElectroMagicTools.logger.info(GregTech Addon detected. Disabling the fix for the Diamond Drill recipe.); } GameRegistry.addRecipe(IC2Items.getItem("nanoHelmet"), "XYX", "XZX", 'X', IC2Items.getItem("carbonPlate"), 'Y', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(IC2Items.getItem("nightvisionGoggles").getItem(), 1, OreDictionary.WILDCARD_VALUE)); @@ -336,7 +335,7 @@ public class RecipeRegistry { IRecipeInput input = it.next(); if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) { it.remove(); - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.amberConflict")); + ElectroMagicTools.logger.info(Removing conflicting amber macerating recipe(s)); } } @@ -344,7 +343,7 @@ public class RecipeRegistry { IRecipeInput input = it.next(); if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0))) { it.remove(); - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.cinnabarConflict")); + ElectroMagicTools.logger.info(Removing Conflicting cinnabar macerating recipe(s)); } } } diff --git a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java index 7443aad..8af137c 100644 --- a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java @@ -59,7 +59,7 @@ public class EventHandlerEMT { public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { if (event.modID.equals(ModInformation.modid)) { ConfigHandler.syncConfig(); - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.config.refresh")); + ElectroMagicTools.logger.info(Refreshing configuration file.); } } diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index e16b41f..048bf00 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -356,29 +356,4 @@ emt.rsname.Quantum Wings=Quantum Wings emt.text.Quantum Wings=After exploring all the possibilities of nanotechnologies, you decided to do the last jump. Quantum. You can thrust yourself many blocks high, have a very good protection, and your fall is slowed down a lot. However, the quantum unpredictability happened once again. Your fall will be completely stopped when spacebar and sneak are maintained. You don't know why, but it works. Included: fall damage reduction, 100%. emt.rsname.InfusedQuantumArmor=Infused Quantum Сhestplate. -emt.text.InfusedQuantumArmor=You had been nothing to do and you decided to do something useful. You had an idea in your head of making armor which you can fasten the wings or backpack for being protected in flight. Take the wings or backpack in your hands and sit down to put their on armor. To remove them, hold Shift + "Unequip"(see in options). -#=============Console Logging============= -console.EMT.preInit.begin=Starting planning the world domination -console.EMT.preInit.configRead=Creating/Reading the config file -console.EMT.preInit.end=Planning complete - -console.EMT.init.begin=Gathering allies -console.EMT.init.loadProxies=Loading the proxies -console.EMT.init.mobDrops=Making mobs drop additional items -console.EMT.init.dungeon=Adding dungeon loot -console.EMT.init.recipes=Adding the Init recipes -console.EMT.init.entities=Registering entities -console.EMT.init.guiHandler=Registering the GUI Handler -console.EMT.init.end=Allies gathered. - -console.EMT.postInit.begin=Starting the world takeover -console.EMT.postInit.recipes=Adding PostInit recipes -console.EMT.postInit.recipes.uumatter=Adding the UU-Matter Infusion recipes -console.EMT.postInit.end=World takeover complete. Enjoy! - -console.EMT.config.refresh=Refreshing configuration file. - -console.EMT.recipes.amberConflict=Removing conflicting amber macerating recipe(s) -console.EMT.recipes.cinnabarConflict=Removing Conflicting cinnabar macerating recipe(s) - -console.EMT.modLoaded.GT=GregTech Addon detected. Disabling the fix for the Diamond Drill recipe. +emt.text.InfusedQuantumArmor=You had been nothing to do and you decided to do something useful. You had an idea in your head of making armor which you can fasten the wings or backpack for being protected in flight. Take the wings or backpack in your hands and sit down to put their on armor. To remove them, hold Shift + "Unequip"(see in options). \ No newline at end of file diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang index 993ad64..5830b59 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -354,30 +354,4 @@ emt.text.Quantum Wings=После исследования всех возмож emt.rsname.InfusedQuantumArmor=Наполненный квантовый нагрудник. emt.tag.InfusedQuantumArmor=Последний шаг... -emt.text.InfusedQuantumArmor=Вам было нечего делать, и Вы решили заняться хоть чем-то полезным. Вам в голову пришла идея создания брони, на которую можно нацепить крылья или ранец, чтобы быть защищёнными в полёте. Возмите в руку крылья или ранец, и присядьте чтобы надеть их на броню. Чтобы снять их, зажмите Shift + "Снять"(Смотрите в настройках). - -#=============Console Logging============= -console.EMT.preInit.begin=Начало планирования над мировым господством -console.EMT.preInit.configRead=Создание/чтение файла конфигурации -console.EMT.preInit.end=Планирование завершено - -console.EMT.init.begin=Сбор союзников -console.EMT.init.loadProxies=Загрузка прокси -console.EMT.init.mobDrops=Добавление предметов для мобов -console.EMT.init.dungeon=Добавление сокровищ -console.EMT.init.recipes=Добавление рецептов -console.EMT.init.entities=Регистрация сущностей -console.EMT.init.guiHandler=Регистрация обработчика интерфейса -console.EMT.init.end=Союзники собраны. - -console.EMT.postInit.begin=Начало захвата мира -console.EMT.postInit.recipes=Добавление рецептов -console.EMT.postInit.recipes.uumatter=Добавление рецептов наполнения для материи -console.EMT.postInit.end=Захват мира завершён. Наслаждайтесь! - -console.EMT.config.refresh=Обновление конфигурационного файла. - -console.EMT.recipes.amberConflict=Удаление конфликтующих рецептов дробления янтаря -console.EMT.recipes.cinnabarConflict=Удаление конфликтующих рецептов дробления киновари - -console.EMT.modLoaded.GT=Обнаружен аддон GregTech. Отключение исправления для рецепта алмазного бура... +emt.text.InfusedQuantumArmor=Вам было нечего делать, и Вы решили заняться хоть чем-то полезным. Вам в голову пришла идея создания брони, на которую можно нацепить крылья или ранец, чтобы быть защищёнными в полёте. Возмите в руку крылья или ранец, и присядьте чтобы надеть их на броню. Чтобы снять их, зажмите Shift + "Снять"(Смотрите в настройках). \ No newline at end of file diff --git a/src/main/resources/assets/electromagictools/lang/zh_CN.lang b/src/main/resources/assets/electromagictools/lang/zh_CN.lang index 183dd4a..0e7d98a 100644 --- a/src/main/resources/assets/electromagictools/lang/zh_CN.lang +++ b/src/main/resources/assets/electromagictools/lang/zh_CN.lang @@ -356,29 +356,4 @@ emt.rsname.Quantum Wings=量子羽翼 emt.text.Quantum Wings=在探索完纳米科技所有的可能性后,你决定做最后一搏,量子.你可以在空中再跳几格的高度, 极好的防护,并且的下降的过程极大减缓了.然而,量子的不可预测又一次发生了.同时按住潜行键和空格键时你的下降会完全停止.你不知道为何会这样,但它就是这样.摔落伤害减免:100%. emt.rsname.InfusedQuantumArmor=注魔量子胸甲 -emt.text.InfusedQuantumArmor=你已经无事可做,但是你决定做一些有用的东西.你的脑海中浮现出一个想法,在制作盔甲时可以把羽翼或者背包系在一起以保证飞行的安全.持有羽翼或者背包时在潜行状态下右击可以将它们系在盔甲上.要将它们拿下来时只需要按住Shift + Ctrl. -#=============Console Logging============= -console.EMT.preInit.begin=谋略如何统治世界 -console.EMT.preInit.configRead=创建/读取配置文件中 -console.EMT.preInit.end=谋略完成 - -console.EMT.init.begin=召集盟军 -console.EMT.init.loadProxies=读取proxies信息 -console.EMT.init.mobDrops=添加新的怪物掉落物 -console.EMT.init.dungeon=增加地牢物品 -console.EMT.init.recipes=添加合成配方 -console.EMT.init.entities=注册新的实体 -console.EMT.init.guiHandler=注册新的GUI -console.EMT.init.end=盟军已汇聚一堂 - -console.EMT.postInit.begin=即将占领世界 -console.EMT.postInit.recipes=增加合成配方 -console.EMT.postInit.recipes.uumatter=添加UU注魔配方 -console.EMT.postInit.end=世界已被我们占领.敬请享受! - -console.EMT.config.refresh=正在刷新配置文件 - -console.EMT.recipes.amberConflict=移除冲突的琥珀矿合成配方 -console.EMT.recipes.cinnabarConflict=移除冲突的朱砂矿合成配方 - -console.EMT.modLoaded.GT=检测到格雷科技.已禁用钻石电钻的合成公式 +emt.text.InfusedQuantumArmor=你已经无事可做,但是你决定做一些有用的东西.你的脑海中浮现出一个想法,在制作盔甲时可以把羽翼或者背包系在一起以保证飞行的安全.持有羽翼或者背包时在潜行状态下右击可以将它们系在盔甲上.要将它们拿下来时只需要按住Shift + Ctrl. \ No newline at end of file diff --git a/src/main/resources/emt.png b/src/main/resources/logo.png similarity index 100% rename from src/main/resources/emt.png rename to src/main/resources/logo.png diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index a609b0b..388e876 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -9,8 +9,8 @@ "updateUrl": "", "authorList": ["fewizz", "TheSilentium"], "credits": "Azanor, Tombenpotter, TehNut, the IC2 guys and the forge guys!", - "logoFile": "emt.png", + "logoFile": "logo.png", "screenshots": [], "dependencies": ["Thaumcraft 4", "IC2"] } -] +] \ No newline at end of file