CAPITAL I cause it looks cool

This commit is contained in:
Kam committed 2023-06-05 22:12:48 -04:00
1 parent 2d0d34bd6e
commit 491e377a3e
40 files changed
+150 -158

No files matched your search

@@ -5,7 +5,6 @@ import noppes.npcs.LogWriter;
import noppes.npcs.api.handler.IAnimationHandler;
import noppes.npcs.api.handler.data.IAnimation;
import noppes.npcs.controllers.data.Animation;
import noppes.npcs.controllers.data.Faction;
import noppes.npcs.util.NBTJsonUtil;
import java.io.File;
@@ -13,16 +12,16 @@ import java.util.*;
public class AnimationController implements IAnimationHandler {
public HashMap<String, Animation> animations;
public static AnimationController instance;
public static AnimationController Instance;
public AnimationController() {
instance = this;
Instance = this;
animations = new HashMap<>();
load();
}
public static AnimationController getInstance(){
return instance;
return Instance;
}
public void load(){
@@ -18,12 +18,12 @@ import java.util.Iterator;
import java.util.List;
public class ChunkController implements LoadingCallback{
public static ChunkController instance;
public static ChunkController Instance;
public HashMap<Entity,Ticket> tickets = new HashMap<Entity,Ticket>();
public ChunkController(){
instance = this;
Instance = this;
}
public void clear(){
@@ -22,13 +22,13 @@ import java.util.*;
public class DialogController implements IDialogHandler {
public HashMap<Integer,DialogCategory> categories = new HashMap<Integer, DialogCategory>();
public HashMap<Integer,Dialog> dialogs = new HashMap<Integer, Dialog>();
public static DialogController instance;
public static DialogController Instance;
private int lastUsedDialogID = 0;
private int lastUsedCatID = 0;
public DialogController(){
instance = this;
Instance = this;
load();
}
@@ -21,13 +21,13 @@ public class QuestController implements IQuestHandler {
public HashMap<Integer,QuestCategory> categories = new HashMap<Integer, QuestCategory>();
public HashMap<Integer,Quest> quests = new HashMap<Integer, Quest>();
public static QuestController instance;
public static QuestController Instance;
private int lastUsedCatID = 0;
private int lastUsedQuestID = 0;
public QuestController(){
instance = this;
Instance = this;
}
public void load(){
@@ -22,7 +22,7 @@ public class RecipeController implements IRecipeHandler {
private static Collection<RecipeCarpentry> prevRecipes;
public HashMap<Integer,RecipeCarpentry> globalRecipes = new HashMap<Integer, RecipeCarpentry>();
public HashMap<Integer,RecipeCarpentry> anvilRecipes = new HashMap<Integer, RecipeCarpentry>();
public static RecipeController instance;
public static RecipeController Instance;
public static final int version = 1;
public int nextId = 1;
@@ -30,7 +30,7 @@ public class RecipeController implements IRecipeHandler {
public static HashMap<Integer,RecipeCarpentry> syncRecipes = new HashMap<Integer, RecipeCarpentry>();
public RecipeController(){
instance = this;
Instance = this;
}
public void load(){
loadCategories();
@@ -210,9 +210,9 @@ public class RecipeController implements IRecipeHandler {
public void addRecipe(RecipeCarpentry recipeAnvil) {
recipeAnvil.id = getUniqueId();
if(!recipeAnvil.isGlobal)
RecipeController.instance.anvilRecipes.put(recipeAnvil.id, recipeAnvil);
RecipeController.Instance.anvilRecipes.put(recipeAnvil.id, recipeAnvil);
else{
RecipeController.instance.globalRecipes.put(recipeAnvil.id, recipeAnvil);
RecipeController.Instance.globalRecipes.put(recipeAnvil.id, recipeAnvil);
}
}
@@ -19,12 +19,12 @@ public class SpawnController implements INaturalSpawnsHandler {
public ArrayList<SpawnData> data = new ArrayList<SpawnData>();
public Random random = new Random();
public static SpawnController instance;
public static SpawnController Instance;
private int lastUsedID = 0;
public SpawnController(){
instance = this;
Instance = this;
loadData();
}
@@ -152,7 +152,7 @@ public class Animation implements IAnimation {
}
public IAnimation save() {
return AnimationController.instance.saveAnimation(this);
return AnimationController.Instance.saveAnimation(this);
}
public void readFromNBT(NBTTagCompound compound){
@@ -325,7 +325,7 @@ public class Dialog implements ICompatibilty, IDialog {
}
public void save() {
DialogController.instance.saveDialog(this.category.id, this);
DialogController.Instance.saveDialog(this.category.id, this);
}
public void setName(String name) {
@@ -354,7 +354,7 @@ public class Dialog implements ICompatibilty, IDialog {
}
public Quest getQuest() {
return QuestController.instance == null ? null : (Quest)QuestController.instance.quests.get(this.quest);
return QuestController.Instance == null ? null : (Quest)QuestController.Instance.quests.get(this.quest);
}
public String getCommand() {
@@ -39,7 +39,7 @@ public class DialogOption {
public boolean hasDialog(){
if(dialogId <= 0)
return false;
if(!DialogController.instance.hasDialog(dialogId)){
if(!DialogController.Instance.hasDialog(dialogId)){
dialogId = -1;
return false;
}
@@ -49,7 +49,7 @@ public class DialogOption {
public Dialog getDialog() {
if(!hasDialog())
return null;
return DialogController.instance.dialogs.get(dialogId);
return DialogController.Instance.dialogs.get(dialogId);
}
public boolean isAvailable(EntityPlayer player) {
@@ -90,7 +90,7 @@ public class PlayerMail implements IInventory, IPlayerMail {
return getQuest() != null;
}
public Quest getQuest() {
return QuestController.instance != null?QuestController.instance.quests.get(questId):null;
return QuestController.Instance != null?QuestController.Instance.quests.get(questId):null;
}
@Override
@@ -57,7 +57,7 @@ public class PlayerQuestData implements IPlayerQuestData {
{
NBTTagCompound nbttagcompound = list2.getCompoundTagAt(i);
int id = nbttagcompound.getInteger("Quest");
Quest quest = QuestController.instance.quests.get(id);
Quest quest = QuestController.Instance.quests.get(id);
if(quest == null)
continue;
QuestData data = new QuestData(quest);
@@ -67,7 +67,7 @@ public class PlayerQuestData implements IPlayerQuestData {
this.activeQuests = activeQuests;
}
this.trackedQuest = QuestController.instance.get(mainCompound.getInteger("TrackedQuestID"));
this.trackedQuest = QuestController.Instance.get(mainCompound.getInteger("TrackedQuestID"));
}
public void saveNBTData(NBTTagCompound maincompound) {
@@ -162,7 +162,7 @@ public class PlayerQuestData implements IPlayerQuestData {
}
public void startQuest(int id) {
Quest quest = QuestController.instance.quests.get(id);
Quest quest = QuestController.Instance.quests.get(id);
if (quest == null)
return;
if(activeQuests.containsKey(id))
@@ -174,7 +174,7 @@ public class PlayerQuestData implements IPlayerQuestData {
}
public void finishQuest(int id) {
Quest quest = QuestController.instance.quests.get(id);
Quest quest = QuestController.Instance.quests.get(id);
if (quest == null)
return;
@@ -185,14 +185,14 @@ public class PlayerQuestData implements IPlayerQuestData {
}
public void stopQuest(int id) {
Quest quest = QuestController.instance.quests.get(id);
Quest quest = QuestController.Instance.quests.get(id);
if (quest == null)
return;
activeQuests.remove(id);
}
public void removeQuest(int id) {
Quest quest = QuestController.instance.quests.get(id);
Quest quest = QuestController.Instance.quests.get(id);
if (quest == null)
return;
activeQuests.remove(id);
@@ -211,7 +211,7 @@ public class PlayerQuestData implements IPlayerQuestData {
List<IQuest> quests = new ArrayList<>();
for (int id : activeQuests.keySet()) {
IQuest quest = (IQuest) QuestController.instance.quests.get(id);
IQuest quest = (IQuest) QuestController.Instance.quests.get(id);
if (quest != null) {
quests.add(quest);
}
@@ -224,7 +224,7 @@ public class PlayerQuestData implements IPlayerQuestData {
List<IQuest> quests = new ArrayList<>();
for (int id : finishedQuests.keySet()) {
IQuest quest = (IQuest) QuestController.instance.quests.get(id);
IQuest quest = (IQuest) QuestController.Instance.quests.get(id);
if (quest != null) {
quests.add(quest);
}
@@ -241,7 +241,7 @@ public class PlayerQuestData implements IPlayerQuestData {
}
public void setLastCompletedTime(int id,long time) {
Quest quest = QuestController.instance.quests.get(id);
Quest quest = QuestController.Instance.quests.get(id);
if (quest == null)
return;
this.finishedQuests.put(id,time);
@@ -127,7 +127,7 @@ public class Quest implements ICompatibilty, IQuest {
}
public Quest getNextQuest()
{
return QuestController.instance == null?null:QuestController.instance.quests.get(nextQuestid);
return QuestController.Instance == null?null:QuestController.Instance.quests.get(nextQuestid);
}
public boolean instantComplete(EntityPlayer player, QuestData data) {
@@ -193,7 +193,7 @@ public class Quest implements ICompatibilty, IQuest {
}
public void save() {
QuestController.instance.saveQuest(this.category.id, this);
QuestController.Instance.saveQuest(this.category.id, this);
}
public void setName(String name) {
@@ -267,14 +267,14 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe {
public void save() {
try {
RecipeController.instance.saveRecipe(this.writeNBT());
RecipeController.Instance.saveRecipe(this.writeNBT());
} catch (IOException var2) {
}
}
public void delete() {
RecipeController.instance.delete(this.id);
RecipeController.Instance.delete(this.id);
}
public ItemStack[] getRecipe() {
@@ -22,7 +22,7 @@ public class RecipesDefault {
RecipeCarpentry recipeAnvil = new RecipeCarpentry(name);
recipeAnvil.isGlobal = isGlobal;
recipeAnvil = RecipeCarpentry.saveRecipe(recipeAnvil, item, recipe);
RecipeController.instance.addRecipe(recipeAnvil);
RecipeController.Instance.addRecipe(recipeAnvil);
}
public static void loadDefaultRecipes(int i) {
if(i < 0){