EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed mod config files loading / generating when they shouldn't have

Browse Source
This commit is contained in:
GJ 2013-01-27 16:21:02 -05:00
parent 43dbb94a7f
commit e61581c4e6
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -162,6 +162,7 @@ Version 1.3.10
+ Added Ability API functions + Added Ability API functions
+ Added 50% & 150% XP boost perks + Added 50% & 150% XP boost perks
+ Added "lucky" perk for donors + Added "lucky" perk for donors
= Fixed mod config files loading / generating when they shouldn't have
= Fixed /inspect not working on offline players = Fixed /inspect not working on offline players
= Fixed custom blocks, tools and armors not loading properly = Fixed custom blocks, tools and armors not loading properly
= Fixed duplication bug with sticky pistons = Fixed duplication bug with sticky pistons

31
src/main/java/com/gmail/nossr50/util/ModChecks.java
View File

@ -17,9 +17,6 @@ public final class ModChecks {
private static boolean customToolsEnabled = configInstance.getToolModsEnabled(); private static boolean customToolsEnabled = configInstance.getToolModsEnabled();
private static boolean customArmorEnabled = configInstance.getArmorModsEnabled(); private static boolean customArmorEnabled = configInstance.getArmorModsEnabled();
private static boolean customBlocksEnabled = configInstance.getBlockModsEnabled(); private static boolean customBlocksEnabled = configInstance.getBlockModsEnabled();
private static CustomToolsConfig toolInstance = CustomToolsConfig.getInstance();
private static CustomArmorConfig armorInstance = CustomArmorConfig.getInstance();
private static CustomBlocksConfig blocksInstance = CustomBlocksConfig.getInstance();
private ModChecks() {} private ModChecks() {}
@ -30,7 +27,7 @@ public final class ModChecks {
* @return the armor if it exists, null otherwise * @return the armor if it exists, null otherwise
*/ */
public static CustomItem getArmorFromItemStack(ItemStack item) { public static CustomItem getArmorFromItemStack(ItemStack item) {
return armorInstance.customArmor.get(item.getTypeId()); return CustomArmorConfig.getInstance().customArmor.get(item.getTypeId());
} }
/** /**
@ -40,7 +37,7 @@ public final class ModChecks {
* @return the tool if it exists, null otherwise * @return the tool if it exists, null otherwise
*/ */
public static CustomTool getToolFromItemStack(ItemStack item) { public static CustomTool getToolFromItemStack(ItemStack item) {
return toolInstance.customTools.get(item.getTypeId()); return CustomToolsConfig.getInstance().customTools.get(item.getTypeId());
} }
/** /**
@ -52,11 +49,11 @@ public final class ModChecks {
public static CustomBlock getCustomBlock(Block block) { public static CustomBlock getCustomBlock(Block block) {
ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1); ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1);
if (!blocksInstance.customItems.contains(item)) { if (!CustomBlocksConfig.getInstance().customItems.contains(item)) {
return null; return null;
} }
for (CustomBlock b : blocksInstance.customBlocks) { for (CustomBlock b : CustomBlocksConfig.getInstance().customBlocks) {
if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) { if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
return b; return b;
} }
@ -74,8 +71,8 @@ public final class ModChecks {
public static boolean isCustomMiningBlock(Block block) { public static boolean isCustomMiningBlock(Block block) {
ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1); ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1);
if (customBlocksEnabled && blocksInstance.customMiningBlocks.contains(item)) { if (customBlocksEnabled && CustomBlocksConfig.getInstance().customMiningBlocks.contains(item)) {
for (CustomBlock b : blocksInstance.customBlocks) { for (CustomBlock b : CustomBlocksConfig.getInstance().customBlocks) {
if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) { if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
return true; return true;
} }
@ -94,8 +91,8 @@ public final class ModChecks {
public static boolean isCustomLeafBlock(Block block) { public static boolean isCustomLeafBlock(Block block) {
ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1); ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1);
if (blocksInstance.customLeaves.contains(item)) { if (CustomBlocksConfig.getInstance().customLeaves.contains(item)) {
for (CustomBlock b : blocksInstance.customBlocks) { for (CustomBlock b : CustomBlocksConfig.getInstance().customBlocks) {
if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) { if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
return true; return true;
} }
@ -114,8 +111,8 @@ public final class ModChecks {
public static boolean isCustomLogBlock(Block block) { public static boolean isCustomLogBlock(Block block) {
ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1); ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1);
if (blocksInstance.customLogs.contains(item)) { if (CustomBlocksConfig.getInstance().customLogs.contains(item)) {
for (CustomBlock b : blocksInstance.customBlocks) { for (CustomBlock b : CustomBlocksConfig.getInstance().customBlocks) {
if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) { if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
return true; return true;
} }
@ -134,8 +131,8 @@ public final class ModChecks {
public static boolean isCustomOreBlock(Block block) { public static boolean isCustomOreBlock(Block block) {
ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1); ItemStack item = (new MaterialData(block.getTypeId(), block.getData())).toItemStack(1);
if (blocksInstance.customOres.contains(item)) { if (CustomBlocksConfig.getInstance().customOres.contains(item)) {
for (CustomBlock b : blocksInstance.customBlocks) { for (CustomBlock b : CustomBlocksConfig.getInstance().customBlocks) {
if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) { if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
return true; return true;
} }
@ -152,7 +149,7 @@ public final class ModChecks {
* @return true if the item is a custom tool, false otherwise * @return true if the item is a custom tool, false otherwise
*/ */
public static boolean isCustomTool(ItemStack item) { public static boolean isCustomTool(ItemStack item) {
if (customToolsEnabled && toolInstance.customTools.containsKey(item.getTypeId())) { if (customToolsEnabled && CustomToolsConfig.getInstance().customTools.containsKey(item.getTypeId())) {
return true; return true;
} }
@ -166,7 +163,7 @@ public final class ModChecks {
* @return true if the item is custom armor, false otherwise * @return true if the item is custom armor, false otherwise
*/ */
public static boolean isCustomArmor(ItemStack item) { public static boolean isCustomArmor(ItemStack item) {
if (customArmorEnabled && armorInstance.customArmor.containsKey(item.getTypeId())) { if (customArmorEnabled && CustomArmorConfig.getInstance().customArmor.containsKey(item.getTypeId())) {
return true; return true;
} }