EpicKnarvik97/ArmoredElytra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop Minecraft 1.9 support

Browse Source
This commit is contained in:
Pim van der Loos
2020-11-23 09:18:49 +01:00
parent bd57ea0728
commit dd30f02aa2
2 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
View File

@@ -51,9 +51,10 @@ public class ArmoredElytra extends JavaPlugin implements Listener
public void onEnable()
{
instance = this;
if (minecraftVersion.isOlderThan(MinecraftVersion.v1_8))
if (minecraftVersion.isOlderThan(MinecraftVersion.v1_9))
{
myLogger(Level.SEVERE, "Trying to run this plugin on an unsupported version... ABORT!");
this.setEnabled(false);
return;
}
@@ -98,7 +99,7 @@ public class ArmoredElytra extends JavaPlugin implements Listener
if (compatibleMCVer())
{
Bukkit.getPluginManager()
.registerEvents(new EventHandlers(this, is1_9, config.craftingInSmithingTable()), this);
.registerEvents(new EventHandlers(this, config.craftingInSmithingTable()), this);
getCommand("ArmoredElytra").setExecutor(new CommandHandler(this));
}
else

40
src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
View File

@@ -30,32 +30,19 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import java.util.function.Consumer;
import java.util.logging.Level;
public class EventHandlers implements Listener
{
private final ArmoredElytra plugin;
private final Consumer<AnvilInventory> cleanAnvilInventory;
private final Consumer<Player> moveChestplateToInventory;
private final boolean creationEnabled;
public EventHandlers(ArmoredElytra plugin, boolean is1_9, boolean creationEnabled)
public EventHandlers(ArmoredElytra plugin, boolean creationEnabled)
{
this.plugin = plugin;
this.creationEnabled = creationEnabled;
initializeArmorEquipEvent();
if (is1_9)
{
cleanAnvilInventory = this::cleanAnvilOld;
moveChestplateToInventory = this::moveChestplateToInventoryOld;
}
else
{
cleanAnvilInventory = this::cleanAnvilNew;
moveChestplateToInventory = this::moveChestplateToInventoryNew;
}
}
private void initializeArmorEquipEvent()
@@ -74,29 +61,14 @@ public class EventHandlers implements Listener
}
}
private void moveChestplateToInventoryOld(Player player)
{
player.getInventory().getChestplate().setType(XMaterial.AIR.parseMaterial());
}
private void moveChestplateToInventoryNew(Player player)
private void moveChestplateToInventory(Player player)
{
player.getInventory().addItem(player.getInventory().getChestplate());
player.getInventory().getChestplate().setAmount(0);
player.updateInventory();
}
// Clean 1.9 inventories.
private void cleanAnvilOld(AnvilInventory anvilInventory)
{
ItemStack air = new ItemStack(XMaterial.AIR.parseMaterial(), 1);
anvilInventory.setItem(0, air);
anvilInventory.setItem(1, air);
anvilInventory.setItem(2, air);
}
// Clean >=1.10 inventories.
private void cleanAnvilNew(AnvilInventory anvilInventory)
private void cleanAnvilInventory(AnvilInventory anvilInventory)
{
if (anvilInventory.getItem(0) != null)
anvilInventory.getItem(0).setAmount(0);
@@ -438,7 +410,7 @@ public class EventHandlers implements Listener
player.setItemOnCursor(result);
// Clean the anvil's inventory after transferring the items.
cleanAnvilInventory.accept(anvilInventory);
cleanAnvilInventory(anvilInventory);
player.updateInventory();
return;
}
@@ -503,7 +475,7 @@ public class EventHandlers implements Listener
// If the durability equals/exceeds maxDurability, it's broken (0 = full item
// durability).
if (durability >= maxDurability)
moveChestplateToInventory.accept(p);
moveChestplateToInventory(p);
else
newDurability = durability + durabilityDelta;
}
@@ -511,7 +483,7 @@ public class EventHandlers implements Listener
if (newDurability >= maxDurability)
{
newDurability = maxDurability;
moveChestplateToInventory.accept(p);
moveChestplateToInventory(p);
}
elytra.setDurability((short) (newDurability));
}