From 1c8ef742d7a20a87de8f378bd0eaac4ec6ebb3d4 Mon Sep 17 00:00:00 2001 From: YoungGT Date: Mon, 27 Nov 2017 22:14:27 +0800 Subject: [PATCH 1/5] Update language files Added entries for these achievements,and fixed the wrong entries. --- .../resources/assets/gregtech/lang/en_US.lang | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 0249c483..31332503 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -159,8 +159,8 @@ achievement.Apatite=Find Apatite Ore achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld achievement.Phosphorus=Find Phosphorus Ore achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld -achievement.Phosphate=Find Phosphate Ore -achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld +achievement.Pyrochlore=Find Pyrochlore Ore +achievement.Pyrochlore.desc=Height: 40-60, Chance: 60, Overworld achievement.Galena=Find Galena Ore achievement.Galena.desc=Height: 30-60, Chance: 40, Overworld achievement.Silver=Find Silver Ore @@ -408,6 +408,10 @@ achievement.finalpreparations=Final Preparations achievement.finalpreparations.desc=Cool down a Hot Naquadria Ingot achievement.denseaspossible=As Dense As Possible achievement.denseaspossible.desc=Produce Neutronium +achievement.zpmage=Energy Module +achievement.zpmage.desc=Craft a Energy Module +achievement.uvage=Energy Cluster +achievement.uvage.desc=Craft a Energy Cluster achievement.whatnow=What now? achievement.whatnow.desc=Craft a Ultimate Battery @@ -418,19 +422,19 @@ achievement.gt.metaitem.01.32607.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32608=Electric Motor UV tier achievement.gt.metaitem.01.32608.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32615=Electric Pump LuV tier -achievement.gt.metaitem.01.32615.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32616=Electric Pump ZPM tier -achievement.gt.metaitem.01.32616.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32617=Electric Pump UV tier -achievement.gt.metaitem.01.32617.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32620=Electric Pump LuV tier +achievement.gt.metaitem.01.32620.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32621=Electric Pump ZPM tier +achievement.gt.metaitem.01.32621.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32622=Electric Pump UV tier +achievement.gt.metaitem.01.32622.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32635=Conveyor Module LuV tier -achievement.gt.metaitem.01.32635.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32636=Conveyor Module ZPM tier +achievement.gt.metaitem.01.32636=Conveyor Module LuV tier achievement.gt.metaitem.01.32636.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32637=Conveyor Module UV tier +achievement.gt.metaitem.01.32637=Conveyor Module ZPM tier achievement.gt.metaitem.01.32637.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32638=Conveyor Module UV tier +achievement.gt.metaitem.01.32638.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32645=Electric Piston LuV tier achievement.gt.metaitem.01.32645.desc=Pickup this item to see the recipe in NEI @@ -446,11 +450,11 @@ achievement.gt.metaitem.01.32656.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32657=Robot Arm UV tier achievement.gt.metaitem.01.32657.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32675=Field Generator tier VI +achievement.gt.metaitem.01.32675=Field Generator LuV tier achievement.gt.metaitem.01.32675.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32676=Field Generator tier VII +achievement.gt.metaitem.01.32676=Field Generator ZPM tier achievement.gt.metaitem.01.32676.desc=Pickup this item to see the recipe in NEI -achievement.gt.metaitem.01.32677=Field Generator tier VIII +achievement.gt.metaitem.01.32677=Field Generator UV tier achievement.gt.metaitem.01.32677.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32685=Emitter LuV tier @@ -494,6 +498,8 @@ achievement.gt.metaitem.01.32736=Energy Module achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32737=Energy Cluster achievement.gt.metaitem.01.32737.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32599=Lapotronic Energy Orb Cluster +achievement.gt.metaitem.01.32599.desc=Pickup this item to see the recipe in NEI achievement.ic2.itemArmorQuantumHelmet=Quantum Helmet achievement.ic2.itemArmorQuantumHelmet.desc=Pickup this item to see the recipe in NEI @@ -540,4 +546,3 @@ for.bees.species.iridium=Iridium for.bees.species.uranium=Uranium for.bees.species.plutonium=Plutonium for.bees.species.naquadah=Naquadah - From df081bd0a7fecbf82bc8309454e9fc1495042bb3 Mon Sep 17 00:00:00 2001 From: YoungGT Date: Mon, 27 Nov 2017 22:31:24 +0800 Subject: [PATCH 2/5] Update zh_CN.lang --- .../resources/assets/gregtech/lang/zh_CN.lang | 50 +++++++++++-------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index 257de7b6..a55eb133 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -13,13 +13,13 @@ item.gregtech:modularelectric2_boots.name=模块化纳米靴子 achievement.Naquadah=找到硅岩矿石 achievement.Naquadah.desc=高度: 10-60, 几率: 10, //末地 -achievement.NaquadahEnriched=找到浓缩硅岩矿石 +achievement.NaquadahEnriched=找到富集硅岩矿石 achievement.NaquadahEnriched.desc=高度: 10-60, 几率: 10, //末地 achievement.Lignite=找到褐煤矿石 achievement.Lignite.desc=高度: 50-130, 几率: 160, 主世界// achievement.Coal=找到煤矿石 achievement.Coal.desc=高度: 50-130, 几率: 160, 主世界// -achievement.Magnetite=找到磁铁矿石 +achievement.Magnetite=找到磁铁矿矿石 achievement.Magnetite.desc=高度: 50-120, 几率: 160, 主世界/下界/ achievement.Iron=找到铁矿石 achievement.Iron.desc=高度: 50-120, 几率: 160, 主世界/下界/ @@ -27,11 +27,11 @@ achievement.VanadiumMagnetite=找到钒磁铁矿石 achievement.VanadiumMagnetite.desc=高度: 50-120, 几率: 160, 主世界/下界/ achievement.Gold=找到金矿石 achievement.Gold.desc=高度: 60-80, 几率: 160, 主世界// -achievement.BrownLimonite=找到褐色褐铁矿矿石 +achievement.BrownLimonite=找到棕褐铁矿矿石 achievement.BrownLimonite.desc=高度: 10-40, 几率: 120, 主世界/下界/ achievement.YellowLimonite=找到黄褐铁矿矿石 achievement.YellowLimonite.desc=高度: 10-40, 几率: 120, 主世界/下界/ -achievement.BandedIron=找到带状铁矿石 +achievement.BandedIron=找到带状铁矿矿石 achievement.BandedIron.desc=高度: 10-40, 几率: 120, 主世界/下界/ achievement.Malachite=找到孔雀石矿石 achievement.Malachite.desc=高度: 10-40, 几率: 120, 主世界/下界/ @@ -87,9 +87,9 @@ achievement.Garnierite=找到硅镁镍矿矿石 achievement.Garnierite.desc=高度: 10-40, 几率: 40, 主世界/下界/末地 achievement.Nickel=找到镍矿石 achievement.Nickel.desc=高度: 10-40, 几率: 40, 主世界/下界/末地 -achievement.Cobaltite=找到辉砷钴矿矿石 +achievement.Cobaltite=找到辉钴矿矿石 achievement.Cobaltite.desc=高度: 10-40, 几率: 40, 主世界/下界/末地 -achievement.Cooperite=找到硫铂矿矿石 +achievement.Cooperite=找到谢尔顿矿矿石 achievement.Cooperite.desc=高度: 40-50, 几率: 5, 主世界//末地 achievement.Palladium=找到钯矿石 achievement.Palladium.desc=高度: 40-50, 几率: 5, 主世界//末地 @@ -115,11 +115,11 @@ achievement.Molybdenite=找到辉钼矿矿石 achievement.Molybdenite.desc=高度: 20-50, 几率: 5, 主世界//末地 achievement.Molybdenum=找到钼矿石 achievement.Molybdenum.desc=高度: 20-50, 几率: 5, 主世界//末地 -achievement.Powellite=找到钼钙矿矿石 +achievement.Powellite=找到钼钨钙矿矿石 achievement.Powellite.desc=高度: 20-50, 几率: 5, 主世界//末地 achievement.Scheelite=找到白钨矿矿石 achievement.Scheelite.desc=高度: 20-50, 几率: 10, 主世界//末地 -achievement.Tungstate=找到钨酸盐矿矿石 +achievement.Tungstate=找到钨酸锂矿石 achievement.Tungstate.desc=高度: 20-50, 几率: 10, 主世界//末地 achievement.Lithium=找到锂矿石 achievement.Lithium.desc=高度: 20-50, 几率: 10, 主世界//末地 @@ -141,7 +141,7 @@ achievement.Tantalite=找到钽铁矿矿石 achievement.Tantalite.desc=高度: 20-30, 几率: 20, 主世界//末地 achievement.Quartzite=找到石英岩矿石 achievement.Quartzite.desc=高度: 40-80, 几率: 60, 主世界// -achievement.Barite=找到叠晶石矿石 +achievement.Barite=找到重晶石矿石 achievement.Barite.desc=高度: 40-80, 几率: 60, 主世界// achievement.CertusQuartz=找到赛特斯石英矿石 achievement.CertusQuartz.desc=高度: 40-80, 几率: 60, 主世界// @@ -159,15 +159,15 @@ achievement.Apatite=找到磷灰石矿石 achievement.Apatite.desc=高度: 40-60, 几率: 60, 主世界// achievement.Phosphorus=找到磷矿石 achievement.Phosphorus.desc=高度: 40-60, 几率: 60, 主世界// -achievement.Phosphate=找到磷酸盐矿石 -achievement.Phosphate.desc=高度: 40-60, 几率: 60, 主世界// +achievement.Pyrochlore=找到烧绿石矿石 +achievement.Pyrochlore.desc=高度: 40-60, 几率: 60, 主世界// achievement.Galena=找到方铅矿矿石 achievement.Galena.desc=高度: 30-60, 几率: 40, 主世界// achievement.Silver=找到银矿石 achievement.Silver.desc=高度: 30-60, 几率: 40, 主世界// achievement.Lead=找到铅矿石 achievement.Lead.desc=高度: 30-60, 几率: 40, 主世界// -achievement.Lazurite=找到天青石矿石 +achievement.Lazurite=找到蓝金石矿石 achievement.Lazurite.desc=高度: 20-50, 几率: 40, 主世界//末地 achievement.Sodalite=找到方钠石矿石 achievement.Sodalite.desc=高度: 20-50, 几率: 40, 主世界//末地 @@ -408,6 +408,10 @@ achievement.finalpreparations=最终准备 achievement.finalpreparations.desc=冷却一个热硅岩瑞亚锭 achievement.denseaspossible=尽可能致密 achievement.denseaspossible.desc=制作中子素 +achievement.zpmage=能量模块 +achievement.zpmage.desc=制作一个能量模块 +achievement.uvage=能量簇 +achievement.uvage.desc=制作一个能量簇 achievement.whatnow=接下来呢? achievement.whatnow.desc=制作一个终极电池 @@ -418,19 +422,19 @@ achievement.gt.metaitem.01.32607.desc=捡起这个物品来在NEI里看它的合 achievement.gt.metaitem.01.32608=UV级电力马达 achievement.gt.metaitem.01.32608.desc=捡起这个物品来在NEI里看它的合成表 -achievement.gt.metaitem.01.32615=LuV级电力泵 -achievement.gt.metaitem.01.32615.desc=捡起这个物品来在NEI里看它的合成表 -achievement.gt.metaitem.01.32616=ZPM级电力泵 -achievement.gt.metaitem.01.32616.desc=捡起这个物品来在NEI里看它的合成表 -achievement.gt.metaitem.01.32617=UV级电力泵 -achievement.gt.metaitem.01.32617.desc=捡起这个物品来在NEI里看它的合成表 +achievement.gt.metaitem.01.32620=LuV级电力泵 +achievement.gt.metaitem.01.32620.desc=捡起这个物品来在NEI里看它的合成表 +achievement.gt.metaitem.01.32621=ZPM级电力泵 +achievement.gt.metaitem.01.32621.desc=捡起这个物品来在NEI里看它的合成表 +achievement.gt.metaitem.01.32622=UV级电力泵 +achievement.gt.metaitem.01.32622.desc=捡起这个物品来在NEI里看它的合成表 -achievement.gt.metaitem.01.32635=LuV级传送带 -achievement.gt.metaitem.01.32635.desc=捡起这个物品来在NEI里看它的合成表 -achievement.gt.metaitem.01.32636=ZPM级传送带 +achievement.gt.metaitem.01.32636=LuV级传送带 achievement.gt.metaitem.01.32636.desc=捡起这个物品来在NEI里看它的合成表 -achievement.gt.metaitem.01.32637=UV级传送带 +achievement.gt.metaitem.01.32637=ZPM级传送带 achievement.gt.metaitem.01.32637.desc=捡起这个物品来在NEI里看它的合成表 +achievement.gt.metaitem.01.32638=UV级传送带 +achievement.gt.metaitem.01.32638.desc=捡起这个物品来在NEI里看它的合成表 achievement.gt.metaitem.01.32645=LuV级电力活塞 achievement.gt.metaitem.01.32645.desc=捡起这个物品来在NEI里看它的合成表 @@ -494,6 +498,8 @@ achievement.gt.metaitem.01.32736=能量模块 achievement.gt.metaitem.01.32736.desc=捡起这个物品来在NEI里看它的合成表 achievement.gt.metaitem.01.32737=能量簇 achievement.gt.metaitem.01.32737.desc=捡起这个物品来在NEI里看它的合成表 +achievement.gt.metaitem.01.32599=兰波顿能量球簇 +achievement.gt.metaitem.01.32599.desc=捡起这个物品来在NEI里看它的合成表 achievement.ic2.itemArmorQuantumHelmet=量子头盔 achievement.ic2.itemArmorQuantumHelmet.desc=捡起这个物品来在NEI里看它的合成表 From 34f885071acedc01ab8a7ab69239f15dec75d58a Mon Sep 17 00:00:00 2001 From: YoungGT Date: Mon, 27 Nov 2017 22:43:50 +0800 Subject: [PATCH 3/5] Fix a bug about achievements We can find that there's always two achievements between "As Dense As Possible" and "What now?" whether you opened the batteries or not,so this PR would like to fix this. --- .../gregtech/loaders/misc/GT_Achievements.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 00a1d687..5c73296a 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemSmeltedEvent; import gregtech.GT_Mod; import gregtech.api.GregTech_API; +import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -207,9 +208,14 @@ public class GT_Achievements { registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1, new Object[]{}), "alienmetallurgy", false); registerAchievement("finalpreparations", 7, 9, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L), "over9000", false); registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "finalpreparations", false); - registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1, new Object[]{}), "denseaspossible", false); - registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1, new Object[]{}), "zpmage", false); - registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1, new Object[]{}), "uvage", false); + if(GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false)) { + registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1, new Object[]{}), "denseaspossible", false); + registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1, new Object[]{}), "zpmage", false); + registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1, new Object[]{}), "uvage", false); + }else { + registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false); + } + // if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ // for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) { @@ -643,4 +649,4 @@ public class GT_Achievements { } } } -} \ No newline at end of file +} From ac87a0ce8ef56497befe7692c7ecf081716ad187 Mon Sep 17 00:00:00 2001 From: YoungGT Date: Thu, 21 Dec 2017 12:47:23 +0800 Subject: [PATCH 4/5] Update en_US.lang --- src/main/resources/assets/gregtech/lang/en_US.lang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 31332503..0c20d6a8 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -159,6 +159,8 @@ achievement.Apatite=Find Apatite Ore achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld achievement.Phosphorus=Find Phosphorus Ore achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld +achievement.Phosphate=Find Phosphate Ore +achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld achievement.Pyrochlore=Find Pyrochlore Ore achievement.Pyrochlore.desc=Height: 40-60, Chance: 60, Overworld achievement.Galena=Find Galena Ore From e97f2e437cc52bd3e6edb428315e15fd16a0b42f Mon Sep 17 00:00:00 2001 From: YoungGT Date: Thu, 21 Dec 2017 12:48:15 +0800 Subject: [PATCH 5/5] Update zh_CN.lang --- src/main/resources/assets/gregtech/lang/zh_CN.lang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index a55eb133..a7bd92db 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -157,8 +157,10 @@ achievement.Olivine=找到橄榄石矿石 achievement.Olivine.desc=高度: 10-40, 几率: 60, 主世界//末地 achievement.Apatite=找到磷灰石矿石 achievement.Apatite.desc=高度: 40-60, 几率: 60, 主世界// -achievement.Phosphorus=找到磷矿石 +achievement.Phosphorus=找到磷酸钙矿石 achievement.Phosphorus.desc=高度: 40-60, 几率: 60, 主世界// +achievement.Phosphate=找到磷酸盐矿石 +achievement.Phosphate.desc=高度: 40-60, 几率: 60, 主世界// achievement.Pyrochlore=找到烧绿石矿石 achievement.Pyrochlore.desc=高度: 40-60, 几率: 60, 主世界// achievement.Galena=找到方铅矿矿石