Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-23 17:47:34 +01:00
Code Issues Projects Releases Wiki Activity

Throw meaningful warnings when wrong Essentials version is used with unsupported mod packs.

Browse Source
This commit is contained in:
KHobbits 2013-11-15 00:22:10 +00:00
parent 82be7546d5
commit 53b1526906
3 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -158,10 +158,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
final int versionNumber = Integer.parseInt(versionMatch.group(1)); final int versionNumber = Integer.parseInt(versionMatch.group(1));
if (versionNumber < BUKKIT_VERSION && versionNumber > 100) if (versionNumber < BUKKIT_VERSION && versionNumber > 100)
{ {
LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *"); wrongVersion();
LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
this.setEnabled(false); this.setEnabled(false);
return; return;
} }
@ -570,6 +567,14 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
} }
} }
static public void wrongVersion()
{
LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
LOGGER.log(Level.SEVERE, _("notRecommendedBukkit"));
LOGGER.log(Level.SEVERE, _("requiredBukkit", Integer.toString(BUKKIT_VERSION)));
LOGGER.log(Level.SEVERE, " * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! * ! *");
}
@Override @Override
public BukkitScheduler getScheduler() public BukkitScheduler getScheduler()
{ {

20
Essentials/src/com/earth2me/essentials/Potions.java
View File

@ -100,14 +100,22 @@ public class Potions
POTIONS.put("wither", PotionEffectType.WITHER); POTIONS.put("wither", PotionEffectType.WITHER);
ALIASPOTIONS.put("decay", PotionEffectType.WITHER); ALIASPOTIONS.put("decay", PotionEffectType.WITHER);
POTIONS.put("healthboost", PotionEffectType.HEALTH_BOOST);
ALIASPOTIONS.put("boost", PotionEffectType.HEALTH_BOOST);
POTIONS.put("absorption", PotionEffectType.ABSORPTION); try // 1.6 update
ALIASPOTIONS.put("absorb", PotionEffectType.ABSORPTION); {
POTIONS.put("healthboost", PotionEffectType.HEALTH_BOOST);
ALIASPOTIONS.put("boost", PotionEffectType.HEALTH_BOOST);
POTIONS.put("saturation", PotionEffectType.SATURATION); POTIONS.put("absorption", PotionEffectType.ABSORPTION);
ALIASPOTIONS.put("food", PotionEffectType.SATURATION); ALIASPOTIONS.put("absorb", PotionEffectType.ABSORPTION);
POTIONS.put("saturation", PotionEffectType.SATURATION);
ALIASPOTIONS.put("food", PotionEffectType.SATURATION);
}
catch (java.lang.NoSuchFieldError e)
{
Essentials.wrongVersion();
}
} }
public static PotionEffectType getByName(String name) public static PotionEffectType getByName(String name)

12
Essentials/src/com/earth2me/essentials/utils/LocationUtil.java
View File

@ -1,5 +1,6 @@
package com.earth2me.essentials.utils; package com.earth2me.essentials.utils;
import com.earth2me.essentials.Essentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -60,7 +61,15 @@ public class LocationUtil
HOLLOW_MATERIALS.add(Material.FENCE_GATE.getId()); HOLLOW_MATERIALS.add(Material.FENCE_GATE.getId());
HOLLOW_MATERIALS.add(Material.WATER_LILY.getId()); HOLLOW_MATERIALS.add(Material.WATER_LILY.getId());
HOLLOW_MATERIALS.add(Material.NETHER_WARTS.getId()); HOLLOW_MATERIALS.add(Material.NETHER_WARTS.getId());
HOLLOW_MATERIALS.add(Material.CARPET.getId());
try // 1.6 update
{
HOLLOW_MATERIALS.add(Material.CARPET.getId());
}
catch (java.lang.NoSuchFieldError e)
{
Essentials.wrongVersion();
}
for (Integer integer : HOLLOW_MATERIALS) for (Integer integer : HOLLOW_MATERIALS)
{ {
@ -160,6 +169,7 @@ public class LocationUtil
public int x; public int x;
public int y; public int y;
public int z; public int z;
public Vector3D(int x, int y, int z) public Vector3D(int x, int y, int z)
{ {
this.x = x; this.x = x;