aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/handler/AchievementHandler.java56
-rw-r--r--src/resources/assets/gregtech/lang/en_US.lang68
2 files changed, 103 insertions, 21 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
index 9fcdfa557c..e19dd01794 100644
--- a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
@@ -10,6 +10,7 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_Log;
import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
@@ -37,14 +38,20 @@ public class AchievementHandler {
public AchievementHandler() {
+ Logger.INFO("Initializing GT++ achievements");
+ GT_Log.out.println("Initializing GT++ achievements");
+
//register first
this.registerAchievement(aBaseAchievementName, 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Neutronium, Materials.Osmium, null), "", true);
//Useful Info
- this.registerAchievement("hatch.control", -2, -2, GregtechItemList.Hatch_Control_Core.get(1), aBaseAchievementName, false);
+ boolean cores = CORE.ConfigSwitches.requireControlCores;
+ if (cores) {
+ this.registerAchievement("hatch.control", -2, -2, GregtechItemList.Hatch_Control_Core.get(1), aBaseAchievementName, false);
+ }
this.registerAchievement("hatch.dynamo.buffered", 2, -2, GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1), aBaseAchievementName, false);
//First multi anyone really needs
- this.registerAchievement("multi.abs", -4, -2, GregtechItemList.Industrial_AlloyBlastSmelter.get(1), "hatch.control", true);
+ this.registerAchievement("multi.abs", -4, -2, GregtechItemList.Industrial_AlloyBlastSmelter.get(1), cores ? "hatch.control" : aBaseAchievementName, true);
//Material Advancement
this.registerAchievement("dust.potin", 0, 2, ALLOY.POTIN.getDust(1), aBaseAchievementName, false);
@@ -95,8 +102,8 @@ public class AchievementHandler {
this.registerAchievement("decay.neptunium238", 11, 8, ItemUtils.getSimpleStack(ModItems.dustNeptunium238), "multi.cyclo", false);
this.registerAchievement("decay.radium226", 12, 8, ItemUtils.getSimpleStack(ModItems.dustRadium226), "multi.cyclo", false);
this.registerAchievement("decay.molybdenum99", 13, 8, ItemUtils.getSimpleStack(ModItems.dustMolybdenum99), "multi.cyclo", false);
- this.registerAchievement("decay.technetium99m", 14, 8, ItemUtils.getSimpleStack(ModItems.dustTechnetium99M), "multi.cyclo", true);
- this.registerAchievement("decay.technetium99", 15, 8, ItemUtils.getSimpleStack(ModItems.dustTechnetium99), "multi.cyclo", true);
+ this.registerAchievement("decay.technetium99m", 14, 8, ItemUtils.getSimpleStack(ModItems.dustTechnetium99M), "multi.cyclo", false);
+ this.registerAchievement("decay.technetium99", 15, 8, ItemUtils.getSimpleStack(ModItems.dustTechnetium99), "multi.cyclo", false);
@@ -195,15 +202,24 @@ public class AchievementHandler {
this.issueAchievement(aPlayer, aBaseAchievementName);
}
+ if (aUnlocalName.contains("item.")) {
+ aUnlocalName = aUnlocalName.substring(5);
+ }
+ else if (aUnlocalName.contains("tile.")) {
+ aUnlocalName = aUnlocalName.substring(5);
+ }
+
+ //Logger.INFO("Picked up "+aUnlocalName);
+
/**
* Misc Blocks
*/
- if (aUnlocalName.equalsIgnoreCase("blockFishTrap")) {
+ if (aUnlocalName.equals("blockFishTrap")) {
this.issueAchievement(aPlayer, "block.fishtrap");
}
- if (aUnlocalName.equalsIgnoreCase("blockBlackGate")) {
+ if (aUnlocalName.equals("blockBlackGate")) {
this.issueAchievement(aPlayer, "block.withercage");
}
@@ -211,38 +227,38 @@ public class AchievementHandler {
/**
* Decayables
*/
- if (aUnlocalName.equalsIgnoreCase("dustNeptunium238")) {
+ if (aUnlocalName.equals("dustNeptunium238")) {
this.issueAchievement(aPlayer, "decay.neptunium238");
}
- else if (aUnlocalName.equalsIgnoreCase("dustRadium226")) {
+ else if (aUnlocalName.equals("dustRadium226")) {
this.issueAchievement(aPlayer, "decay.radium226");
}
- else if (aUnlocalName.equalsIgnoreCase("dustMolybdenum99")) {
+ else if (aUnlocalName.equals("dustMolybdenum99")) {
this.issueAchievement(aPlayer, "decay.molybdenum99");
}
- else if (aUnlocalName.equalsIgnoreCase("dustTechnetium99M")) {
+ else if (aUnlocalName.equals("dustTechnetium99M")) {
this.issueAchievement(aPlayer, "decay.technetium99m");
}
- else if (aUnlocalName.equalsIgnoreCase("dustTechnetium99")) {
+ else if (aUnlocalName.equals("dustTechnetium99")) {
this.issueAchievement(aPlayer, "decay.technetium99");
}
/**
* Random Materials worthy of Achievements
*/
- else if (aUnlocalName.equalsIgnoreCase("itemDustPotin")) {
+ else if (aUnlocalName.equals("itemDustPotin")) {
this.issueAchievement(aPlayer, "dust.potin");
}
- else if (aUnlocalName.equalsIgnoreCase("itemDustEglinSteel")) {
+ else if (aUnlocalName.equals("itemDustEglinSteel")) {
this.issueAchievement(aPlayer, "dust.eglin");
}
- else if (aUnlocalName.equalsIgnoreCase("itemDustStaballoy")) {
+ else if (aUnlocalName.equals("itemDustStaballoy")) {
this.issueAchievement(aPlayer, "dust.staballoy");
}
- else if (aUnlocalName.equalsIgnoreCase("itemDustQuantum")) {
+ else if (aUnlocalName.equals("itemDustQuantum")) {
this.issueAchievement(aPlayer, "dust.quantum");
}
- else if (aUnlocalName.equalsIgnoreCase("itemDustHypogen")) {
+ else if (aUnlocalName.equals("itemDustHypogen")) {
this.issueAchievement(aPlayer, "dust.hypogen");
}
@@ -339,18 +355,18 @@ public class AchievementHandler {
* Casings
*/
- else if (aUnlocalName.equalsIgnoreCase("gtplusplus.blockcasings.14")) {
+ else if (aUnlocalName.equals("gtplusplus.blockcasings.14")) {
this.issueAchievement(aPlayer, "casing.abs");
}
- else if (aUnlocalName.equalsIgnoreCase("gtplusplus.blockcasings.2.9")) {
+ else if (aUnlocalName.equals("gtplusplus.blockcasings.2.9")) {
this.issueAchievement(aPlayer, "casing.cyclotron.coil");
}
- else if (aUnlocalName.equalsIgnoreCase("gtplusplus.blockcasings.3.2")) {
+ else if (aUnlocalName.equals("gtplusplus.blockcasings.3.2")) {
this.issueAchievement(aPlayer, "casing.multiuse");
}
- else if (aUnlocalName.equalsIgnoreCase("gtplusplus.blockcasings.3.15")) {
+ else if (aUnlocalName.equals("gtplusplus.blockcasings.3.15")) {
this.issueAchievement(aPlayer, "casing.containment");
}
}
diff --git a/src/resources/assets/gregtech/lang/en_US.lang b/src/resources/assets/gregtech/lang/en_US.lang
index 56479c2029..ffbb3d8a7a 100644
--- a/src/resources/assets/gregtech/lang/en_US.lang
+++ b/src/resources/assets/gregtech/lang/en_US.lang
@@ -98,7 +98,73 @@ achievement.item.GTPP.BattPack.09.name.desc=[AL] Pickup this item to see the rec
-
+//14/2/19
+achievement.gtpp.start=Gregtech++
+achievement.gtpp.start.desc=So, think you've got what it takes?
+achievement.hatch.control=This is where you put the Control Core
+achievement.hatch.control.desc=A special hatch required by all GT++ Multiblocks.
+achievement.hatch.dynamo.buffered=Buffered Dynamo Hatch
+achievement.hatch.dynamo.buffered.desc=Don't EVER use these on large turbines.
+achievement.multi.abs=Alloy Blast Smelter [ABS]
+achievement.multi.abs.desc=Used to create most late game alloys.
+achievement.dust.potin=Potin!
+achievement.dust.potin.desc=Well, you gotta start somewhere...
+achievement.dust.eglin=Eglin Steel!
+achievement.dust.eglin.desc=Progress, albeit slow...
+achievement.dust.staballoy=Staballoy!
+achievement.dust.staballoy.desc=Now we're talking...
+achievement.dust.quantum=Quantum!
+achievement.dust.quantum.desc=Raw Matter.
+achievement.dust.hypogen=Hypogen!
+achievement.dust.hypogen.desc=What even is this material?
+achievement.block.fishtrap=Free Fish
+achievement.block.fishtrap.desc=Better than HarvestCraft.
+achievement.block.withercage=Jail
+achievement.block.withercage.desc=Trap a Wither/Dragon with this.
+achievement.rtg=Radioisotope Thermoelectric Generation!
+achievement.rtg.desc=Probably stolen from Russia, use with care.
+achievement.dehydrate=Dehydration
+achievement.dehydrate.desc=Drink some water.
+achievement.semifluid=It's like a fluid, but it's not
+achievement.semifluid.desc=Semifluids are confusing.
+achievement.earlywasher=Simple Ore Washer
+achievement.earlywasher.desc=Runs on ULV only.
+achievement.advancedsteam=Alternative Steam options
+achievement.advancedsteam.desc=Smart fuel consumption
+achievement.pollutionremoval=Pollution, no more!
+achievement.pollutionremoval.desc=POLLUTION IS BAD
+achievement.hiampxform=High Amp Transformers
+achievement.hiampxform.desc=Advanced power transformation
+achievement.multi.pss=Power Sub-Station [PSS]
+achievement.multi.pss.desc=Grid Power Storage.
+achievement.multi.cyclo=Cyclotron
+achievement.multi.cyclo.desc=Advanced Science
+achievement.multi.sifter=Industrial Sifter
+achievement.multi.sifter.desc=Faster than a turtle.
+achievement.multi.cokeoven=Industrial Coke Oven [ICO]
+achievement.multi.cokeoven.desc=Better than a Pyrolyse
+achievement.multi.boiler.thermal=Thermal Boiler
+achievement.multi.boiler.thermal.desc=Pahoehoe works too!
+achievement.multi.zhuhai=Zhuhai, Fishing Port
+achievement.multi.zhuhai.desc=Actually exists
+achievement.casing.abs=Slow Progress
+achievement.casing.abs.desc=Eventually, you will have your ABS.
+achievement.casing.cyclotron.coil=Slower Progress
+achievement.casing.cyclotron.coil.desc=Consider why you're even doing this..
+achievement.casing.multiuse=I'm going to make lots of these
+achievement.casing.multiuse.desc=Don't start counting.
+achievement.casing.containment=What's this for?
+achievement.casing.containment.desc=I should probably try find out.
+achievement.decay.neptunium238=Neptunium 238
+achievement.decay.neptunium238.desc=Cyclotron Product
+achievement.decay.radium226=Radium 226
+achievement.decay.radium226.desc=Cyclotron Product
+achievement.decay.molybdenum99=Molybdenum 99
+achievement.decay.molybdenum99.desc=Cyclotron Product
+achievement.decay.technetium99m=Technetium 99M
+achievement.decay.technetium99m.desc=Cyclotron Product
+achievement.decay.technetium99=Technetium 99
+achievement.decay.technetium99.desc=Cyclotron Product
generated by cgit (git 2.46.0) at 2025-03-19 17:21:05 +0000