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

Refactoring the oopsies

Browse Source
This commit is contained in:
nossr50
2019-02-16 16:11:55 -08:00
parent 9731b9cffb
commit acf2bf362f
17 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java
View File

@@ -4,7 +4,7 @@ import com.gmail.nossr50.config.HiddenConfig;
public class ChunkletManagerFactory {
public static ChunkletManager getChunkletManager() {
HiddenConfig hConfig = HiddenMainConfig.getInstance();
HiddenConfig hConfig = HiddenConfig.getInstance();
if (hConfig.getChunkletsEnabled()) {
return new HashChunkletManager();

2
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java
View File

@@ -4,7 +4,7 @@ import com.gmail.nossr50.config.HiddenConfig;
public class ChunkManagerFactory {
public static ChunkManager getChunkManager() {
HiddenConfig hConfig = HiddenMainConfig.getInstance();
HiddenConfig hConfig = HiddenConfig.getInstance();
if (hConfig.getChunkletsEnabled()) {
return new HashChunkManager();

4
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java
View File

@@ -18,7 +18,7 @@ public class BlockStoreConversionMain implements Runnable {
this.world = world;
this.scheduler = mcMMO.p.getServer().getScheduler();
this.dataDir = new File(this.world.getWorldFolder(), "mcmmo_data");
this.converters = new BlockStoreConversionXDirectory[HiddenMainConfig.getInstance().getConversionRate()];
this.converters = new BlockStoreConversionXDirectory[HiddenConfig.getInstance().getConversionRate()];
}
public void start() {
@@ -51,7 +51,7 @@ public class BlockStoreConversionMain implements Runnable {
this.xDirs = this.dataDir.listFiles();
for (this.i = 0; (this.i < HiddenMainConfig.getInstance().getConversionRate()) && (this.i < this.xDirs.length); this.i++) {
for (this.i = 0; (this.i < HiddenConfig.getInstance().getConversionRate()) && (this.i < this.xDirs.length); this.i++) {
if (this.converters[this.i] == null) {
this.converters[this.i] = new BlockStoreConversionXDirectory();
}

4
src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java
View File

@@ -20,7 +20,7 @@ public class BlockStoreConversionXDirectory implements Runnable {
public void start(org.bukkit.World world, File dataDir) {
this.world = world;
this.scheduler = mcMMO.p.getServer().getScheduler();
this.converters = new BlockStoreConversionZDirectory[HiddenMainConfig.getInstance().getConversionRate()];
this.converters = new BlockStoreConversionZDirectory[HiddenConfig.getInstance().getConversionRate()];
this.dataDir = dataDir;
if (this.taskID >= 0) {
@@ -52,7 +52,7 @@ public class BlockStoreConversionXDirectory implements Runnable {
this.zDirs = this.dataDir.listFiles();
for (this.i = 0; (this.i < HiddenMainConfig.getInstance().getConversionRate()) && (this.i < this.zDirs.length); this.i++) {
for (this.i = 0; (this.i < HiddenConfig.getInstance().getConversionRate()) && (this.i < this.zDirs.length); this.i++) {
if (this.converters[this.i] == null) {
this.converters[this.i] = new BlockStoreConversionZDirectory();
}

4
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
View File

@@ -129,7 +129,7 @@ public class SkillUtils {
}
public static void handleAbilitySpeedIncrease(Player player) {
if (HiddenMainConfig.getInstance().useEnchantmentBuffs()) {
if (HiddenConfig.getInstance().useEnchantmentBuffs()) {
ItemStack heldItem = player.getInventory().getItemInMainHand();
if (heldItem == null || heldItem.getType() == Material.AIR) {
@@ -187,7 +187,7 @@ public class SkillUtils {
}
public static void handleAbilitySpeedDecrease(Player player) {
if (!HiddenMainConfig.getInstance().useEnchantmentBuffs()) {
if (!HiddenConfig.getInstance().useEnchantmentBuffs()) {
return;
}

12
src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java
View File

@@ -14,13 +14,13 @@ public class SoundManager {
*/
public static void sendSound(Player player, Location location, SoundType soundType)
{
if(SoundMainConfig.getInstance().getIsEnabled(soundType))
if(SoundConfig.getInstance().getIsEnabled(soundType))
player.playSound(location, getSound(soundType), SoundCategory.MASTER, getVolume(soundType), getPitch(soundType));
}
public static void sendCategorizedSound(Player player, Location location, SoundType soundType, SoundCategory soundCategory)
{
if(SoundMainConfig.getInstance().getIsEnabled(soundType))
if(SoundConfig.getInstance().getIsEnabled(soundType))
player.playSound(location, getSound(soundType), soundCategory, getVolume(soundType), getPitch(soundType));
}
@@ -28,13 +28,13 @@ public class SoundManager {
{
float totalPitch = Math.min(2.0F, (getPitch(soundType) + pitchModifier));
if(SoundMainConfig.getInstance().getIsEnabled(soundType))
if(SoundConfig.getInstance().getIsEnabled(soundType))
player.playSound(location, getSound(soundType), soundCategory, getVolume(soundType), totalPitch);
}
public static void worldSendSound(World world, Location location, SoundType soundType)
{
if(SoundMainConfig.getInstance().getIsEnabled(soundType))
if(SoundConfig.getInstance().getIsEnabled(soundType))
world.playSound(location, getSound(soundType), getVolume(soundType), getPitch(soundType));
}
@@ -45,7 +45,7 @@ public class SoundManager {
*/
private static float getVolume(SoundType soundType)
{
return SoundMainConfig.getInstance().getVolume(soundType) * SoundMainConfig.getInstance().getMasterVolume();
return SoundConfig.getInstance().getVolume(soundType) * SoundConfig.getInstance().getMasterVolume();
}
private static float getPitch(SoundType soundType)
@@ -55,7 +55,7 @@ public class SoundManager {
else if (soundType == SoundType.POP)
return getPopPitch();
else
return SoundMainConfig.getInstance().getPitch(soundType);
return SoundConfig.getInstance().getPitch(soundType);
}
private static Sound getSound(SoundType soundType)