EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-03 13:05:30 +02:00
Code Issues Projects Releases Wiki Activity

Fix spelling mistake + Wire up ChimaeraWing

Browse Source
This commit is contained in:
nossr50
2019-06-06 04:19:01 -07:00
parent 240ab0a0af
commit 237311a98f
5 changed files with 37 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/gmail/nossr50/config/MainConfig.java
View File

@@ -284,47 +284,6 @@ public class MainConfig extends ConfigValidated {
return getIntValue(HARDCORE, VAMPIRISM, LEVEL_THRESHOLD);
}
/* Items */
public int getChimaeraUseCost() {
return getIntValue(ITEMS, CHIMAERA_WING, USE_COST);
}
public int getChimaeraRecipeCost() {
return getIntValue(ITEMS, CHIMAERA_WING, RECIPE_COST);
}
public Material getChimaeraItem() {
return Material.matchMaterial(getStringValue(ITEMS, CHIMAERA_WING, ITEM + NAME));
}
public boolean getChimaeraEnabled() {
return getBooleanValue(ITEMS, CHIMAERA_WING, ENABLED);
}
public boolean getChimaeraPreventUseUnderground() {
return getBooleanValue(ITEMS, CHIMAERA_WING, PREVENT_USE_UNDERGROUND);
}
public boolean getChimaeraUseBedSpawn() {
return getBooleanValue(ITEMS, CHIMAERA_WING, USE_BED_SPAWN);
}
public int getChimaeraCooldown() {
return getIntValue(ITEMS, CHIMAERA_WING, COOLDOWN);
}
public int getChimaeraWarmup() {
return getIntValue(ITEMS, CHIMAERA_WING, WARMUP);
}
public int getChimaeraRecentlyHurtCooldown() {
return getIntValue(ITEMS, CHIMAERA_WING, RECENTLY_HURT + COOLDOWN);
}
public boolean getChimaeraSoundEnabled() {
return getBooleanValue(ITEMS, CHIMAERA_WING, SOUND + "_" + ENABLED);
}
/* Particles */
public boolean getAbilityActivationEffectEnabled() {
return getBooleanValue(PARTICLES, ABILITY_ACTIVATION);

12
src/main/java/com/gmail/nossr50/config/hocon/items/ConfigItems.java
View File

@@ -17,7 +17,7 @@ public class ConfigItems {
return consumables.getChimaeraWing();
}
public int getUseCost() {
public int getChimaeraWingUseCost() {
return getChimaeraWing().getUseCost();
}
@@ -25,11 +25,11 @@ public class ConfigItems {
return getChimaeraWing().getRecipeCost();
}
public String getRecipeMats() {
public String getChimaeraWingRecipeMats() {
return getChimaeraWing().getRecipeMats();
}
public int getWarmup() {
public int getChimaeraWingWarmup() {
return getChimaeraWing().getWarmup();
}
@@ -37,7 +37,7 @@ public class ConfigItems {
return getChimaeraWing().getCooldown();
}
public boolean isEnabled() {
public boolean isChimaeraWingEnabled() {
return getChimaeraWing().isEnabled();
}
@@ -49,11 +49,11 @@ public class ConfigItems {
return getChimaeraWing().isPreventUndergroundUse();
}
public boolean isUseBedSpawn() {
public boolean doesChimaeraUseBedSpawn() {
return getChimaeraWing().isUseBedSpawn();
}
public boolean isSoundEnabled() {
public boolean isChimaeraWingSoundEnabled() {
return getChimaeraWing().isSoundEnabled();
}
}