mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 21:20:06 +00:00
Fix JABBA-related issues with crafting station slots (#54)
* Fix shift-merging tools voiding items fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392> * Change 0-sized ItemStacks into null stacks in crafting station attached slots Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425> * Update buildscript * spotlessApply
This commit is contained in:
1 parent
18bfeaff32
commit
39be06c23b
571 files changed
+25959
-28223
No files matched your search
@@ -10,8 +10,7 @@ import tconstruct.smeltery.TinkerSmeltery;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
|
||||
public class TAchievements
|
||||
{
|
||||
public class TAchievements {
|
||||
|
||||
private static AchievementPage achievementsPage;
|
||||
private static HashMap<String, Achievement> achievementsList = new HashMap<String, Achievement>();
|
||||
@@ -21,10 +20,8 @@ public class TAchievements
|
||||
* @param name The name of the achievement
|
||||
* @param achievement The achievement
|
||||
*/
|
||||
public static void addAchievement (String name, Achievement achievement)
|
||||
{
|
||||
if (!PHConstruct.achievementsEnabled)
|
||||
{
|
||||
public static void addAchievement(String name, Achievement achievement) {
|
||||
if (!PHConstruct.achievementsEnabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -36,8 +33,7 @@ public class TAchievements
|
||||
* @param name The name of the achievement
|
||||
* @return The achievement
|
||||
*/
|
||||
public static Achievement getAchievement (String name)
|
||||
{
|
||||
public static Achievement getAchievement(String name) {
|
||||
return achievementsList.get(name);
|
||||
}
|
||||
|
||||
@@ -46,17 +42,14 @@ public class TAchievements
|
||||
* @param player The player that earned the achievement
|
||||
* @param name The name of the achievement
|
||||
*/
|
||||
public static void triggerAchievement (EntityPlayer player, String name)
|
||||
{
|
||||
if (!PHConstruct.achievementsEnabled)
|
||||
{
|
||||
public static void triggerAchievement(EntityPlayer player, String name) {
|
||||
if (!PHConstruct.achievementsEnabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
Achievement ach = getAchievement(name);
|
||||
|
||||
if (ach != null)
|
||||
{
|
||||
if (ach != null) {
|
||||
player.triggerAchievement(ach);
|
||||
}
|
||||
}
|
||||
@@ -64,38 +57,94 @@ public class TAchievements
|
||||
/**
|
||||
* Adds all the achievements included in TConstruct, call before registerAchievementPane is called
|
||||
*/
|
||||
public static void addDefaultAchievements ()
|
||||
{
|
||||
if (!PHConstruct.achievementsEnabled)
|
||||
{
|
||||
public static void addDefaultAchievements() {
|
||||
if (!PHConstruct.achievementsEnabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
addAchievement("tconstruct.beginner", new Achievement("tconstruct.beginner", "tconstruct.beginner", 0, 0, TinkerTools.manualBook, null).initIndependentStat());
|
||||
addAchievement("tconstruct.pattern", new Achievement("tconstruct.pattern", "tconstruct.pattern", 2, 1, TinkerTools.blankPattern, getAchievement("tconstruct.beginner")));
|
||||
addAchievement("tconstruct.tinkerer", new Achievement("tconstruct.tinkerer", "tconstruct.tinkerer", 2, 2, new ItemStack(TinkerTools.titleIcon, 1, 4096), getAchievement("tconstruct.pattern")));
|
||||
addAchievement("tconstruct.preparedFight", new Achievement("tconstruct.preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TinkerTools.titleIcon, 1, 4097), getAchievement("tconstruct.tinkerer")));
|
||||
addAchievement("tconstruct.proTinkerer", new Achievement("tconstruct.proTinkerer", "tconstruct.proTinkerer", 4, 3, new ItemStack(TinkerTools.titleIcon, 1, 4098), getAchievement("tconstruct.tinkerer")));
|
||||
addAchievement("tconstruct.smelteryMaker", new Achievement("tconstruct.smelteryMaker", "tconstruct.smelteryMaker", -2, -1, TinkerSmeltery.smeltery, getAchievement("tconstruct.beginner")));
|
||||
addAchievement("tconstruct.enemySlayer", new Achievement("tconstruct.enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TinkerTools.titleIcon, 1, 4099), getAchievement("tconstruct.preparedFight")));
|
||||
addAchievement("tconstruct.dualConvenience", new Achievement("tconstruct.dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TinkerTools.titleIcon, 1, 4100), getAchievement("tconstruct.enemySlayer")).setSpecial());
|
||||
addAchievement(
|
||||
"tconstruct.beginner",
|
||||
new Achievement("tconstruct.beginner", "tconstruct.beginner", 0, 0, TinkerTools.manualBook, null)
|
||||
.initIndependentStat());
|
||||
addAchievement(
|
||||
"tconstruct.pattern",
|
||||
new Achievement(
|
||||
"tconstruct.pattern",
|
||||
"tconstruct.pattern",
|
||||
2,
|
||||
1,
|
||||
TinkerTools.blankPattern,
|
||||
getAchievement("tconstruct.beginner")));
|
||||
addAchievement(
|
||||
"tconstruct.tinkerer",
|
||||
new Achievement(
|
||||
"tconstruct.tinkerer",
|
||||
"tconstruct.tinkerer",
|
||||
2,
|
||||
2,
|
||||
new ItemStack(TinkerTools.titleIcon, 1, 4096),
|
||||
getAchievement("tconstruct.pattern")));
|
||||
addAchievement(
|
||||
"tconstruct.preparedFight",
|
||||
new Achievement(
|
||||
"tconstruct.preparedFight",
|
||||
"tconstruct.preparedFight",
|
||||
1,
|
||||
3,
|
||||
new ItemStack(TinkerTools.titleIcon, 1, 4097),
|
||||
getAchievement("tconstruct.tinkerer")));
|
||||
addAchievement(
|
||||
"tconstruct.proTinkerer",
|
||||
new Achievement(
|
||||
"tconstruct.proTinkerer",
|
||||
"tconstruct.proTinkerer",
|
||||
4,
|
||||
3,
|
||||
new ItemStack(TinkerTools.titleIcon, 1, 4098),
|
||||
getAchievement("tconstruct.tinkerer")));
|
||||
addAchievement(
|
||||
"tconstruct.smelteryMaker",
|
||||
new Achievement(
|
||||
"tconstruct.smelteryMaker",
|
||||
"tconstruct.smelteryMaker",
|
||||
-2,
|
||||
-1,
|
||||
TinkerSmeltery.smeltery,
|
||||
getAchievement("tconstruct.beginner")));
|
||||
addAchievement(
|
||||
"tconstruct.enemySlayer",
|
||||
new Achievement(
|
||||
"tconstruct.enemySlayer",
|
||||
"tconstruct.enemySlayer",
|
||||
0,
|
||||
5,
|
||||
new ItemStack(TinkerTools.titleIcon, 1, 4099),
|
||||
getAchievement("tconstruct.preparedFight")));
|
||||
addAchievement(
|
||||
"tconstruct.dualConvenience",
|
||||
new Achievement(
|
||||
"tconstruct.dualConvenience",
|
||||
"tconstruct.dualConvenience",
|
||||
0,
|
||||
7,
|
||||
new ItemStack(TinkerTools.titleIcon, 1, 4100),
|
||||
getAchievement("tconstruct.enemySlayer"))
|
||||
.setSpecial());
|
||||
}
|
||||
|
||||
/**
|
||||
* Should be called after all the achievements are loaded (PostInit would be good)
|
||||
*/
|
||||
public static void registerAchievementPane ()
|
||||
{
|
||||
if (!PHConstruct.achievementsEnabled)
|
||||
{
|
||||
public static void registerAchievementPane() {
|
||||
if (!PHConstruct.achievementsEnabled) {
|
||||
return;
|
||||
}
|
||||
|
||||
Achievement[] achievements = new Achievement[achievementsList.size()];
|
||||
|
||||
achievements = achievementsList.values().toArray(achievements);
|
||||
achievementsPage = new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achievements);
|
||||
achievementsPage =
|
||||
new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achievements);
|
||||
AchievementPage.registerAchievementPage(achievementsPage);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user