mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Merge pull request #541 from Meta-Win/master

Browse Source 
Changed getName to getID and some deprecation fix
This commit is contained in:
TheBusyBiscuit 2017-12-20 21:09:43 +01:00 committed by GitHub
commit 5c6b8bd838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/me/mrCookieSlime/Slimefun/Lists/RecipeType.java
View File

@ -62,7 +62,7 @@ public class RecipeType {
}
public SlimefunItem getMachine() {
return SlimefunItem.getByName(machine);
return SlimefunItem.getByID(machine);
}
public static List<ItemStack> getRecipeInputs(SlimefunItem machine) {

3
src/me/mrCookieSlime/Slimefun/api/BlockStorage.java
View File

@ -4,7 +4,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -240,7 +239,7 @@ public class BlockStorage {
public static void store(Block block, ItemStack item) {
SlimefunItem sfitem = SlimefunItem.getByItem(item);
if (sfitem != null) addBlockInfo(block, "id", sfitem.getName(), true);
if (sfitem != null) addBlockInfo(block, "id", sfitem.getID(), true);
}
public static void store(Block block, String item) {

1
src/me/mrCookieSlime/Slimefun/api/inventory/BlockMenu.java
View File

@ -2,7 +2,6 @@ package me.mrCookieSlime.Slimefun.api.inventory;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.Location;
import org.bukkit.block.Block;

1
src/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java
View File

@ -2,7 +2,6 @@ package me.mrCookieSlime.Slimefun.api.inventory;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu;

6
src/me/mrCookieSlime/Slimefun/api/machine/MachineConfig.java
View File

@ -23,10 +23,10 @@ public class MachineConfig extends Config {
}
public MachineSettings getSettings(AContainer item) {
if (!this.children.containsKey(item.getName())) {
this.children.put(item.getName(), new MachineSettings(this, item));
if (!this.children.containsKey(item.getID())) {
this.children.put(item.getID(), new MachineSettings(this, item));
}
return this.children.get(item.getName());
return this.children.get(item.getID());
}
}

2
src/me/mrCookieSlime/Slimefun/api/machine/MachineSettings.java
View File

@ -15,7 +15,7 @@ public class MachineSettings {
public MachineSettings(MachineConfig cfg, AContainer machine) {
this.cfg = cfg;
this.prefix = machine.getName();
this.prefix = machine.getID();
}
public String getString(String path) {

6
src/me/mrCookieSlime/Slimefun/listeners/AncientAltarListener.java
View File

@ -29,9 +29,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.inventory.InventoryPickupItemEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.metadata.FixedMetadataValue;
@ -58,7 +56,7 @@ public class AncientAltarListener implements Listener {
e.setCancelled(true);
Item stack = findItem(b);
if (stack == null) {
if(e.getPlayer().getItemInHand().getType().equals(Material.AIR)) return;
if(e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)) return;
if(b.getRelative(0, 1, 0).getType() != Material.AIR) {
Messages.local.sendTranslation(e.getPlayer(), "machines.ANCIENT_PEDESTAL.obstructed", true);
return;
@ -168,7 +166,7 @@ public class AncientAltarListener implements Listener {
Block b = e.getBlockPlaced().getRelative(0, -1, 0);
SlimefunItem item = BlockStorage.check(b);
if(item == null) return;
if(item.getName().equalsIgnoreCase("ANCIENT_PEDESTAL")) {
if(item.getID().equalsIgnoreCase("ANCIENT_PEDESTAL")) {
Messages.local.sendTranslation(e.getPlayer(), "messages.cannot-place", true);
e.setCancelled(true);
}

4
src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java
View File

@ -369,8 +369,8 @@ public class ItemListener implements Listener {
else if (e.getEntity() instanceof Wither) {
SlimefunItem item = BlockStorage.check(e.getBlock());
if (item != null) {
if (item.getName().equals("WITHER_PROOF_OBSIDIAN")) e.setCancelled(true);
if (item.getName().equals("WITHER_PROOF_GLASS")) e.setCancelled(true);
if (item.getID().equals("WITHER_PROOF_OBSIDIAN")) e.setCancelled(true);
if (item.getID().equals("WITHER_PROOF_GLASS")) e.setCancelled(true);
}
}
}

6
src/me/mrCookieSlime/Slimefun/listeners/TeleporterListener.java
View File

@ -29,7 +29,7 @@ public class TeleporterListener implements Listener {
SlimefunItem item = BlockStorage.check(e.getClickedBlock());
if (item == null) return;
if (item.getName().equals("GPS_ACTIVATION_DEVICE_SHARED")) {
if (item.getID().equals("GPS_ACTIVATION_DEVICE_SHARED")) {
SlimefunItem teleporter = BlockStorage.check(e.getClickedBlock().getRelative(BlockFace.DOWN));
if (teleporter instanceof Teleporter) {
@ -44,7 +44,7 @@ public class TeleporterListener implements Listener {
}
}
}
else if (item.getName().equals("GPS_ACTIVATION_DEVICE_PERSONAL")) {
else if (item.getID().equals("GPS_ACTIVATION_DEVICE_PERSONAL")) {
if (BlockStorage.getBlockInfo(e.getClickedBlock(), "owner").equals(e.getPlayer().getUniqueId().toString())) {
SlimefunItem teleporter = BlockStorage.check(e.getClickedBlock().getRelative(BlockFace.DOWN));
@ -62,7 +62,7 @@ public class TeleporterListener implements Listener {
}
else e.setCancelled(true);
}
else if (item.getName().equals("ELEVATOR_PLATE")) {
else if (item.getID().equals("ELEVATOR_PLATE")) {
Elevator.openDialogue(e.getPlayer(), e.getClickedBlock());
}
}

21
src/me/mrCookieSlime/Slimefun/listeners/ToolListener.java
View File

@ -27,7 +27,6 @@ import me.mrCookieSlime.Slimefun.Variables;
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.HandledBlock;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Talisman;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.Interfaces.NotPlaceable;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers.BlockBreakHandler;
@ -54,9 +53,9 @@ public class ToolListener implements Listener {
if (item != null && item.getType() == Material.INK_SACK) return;
SlimefunItem sfItem = SlimefunItem.getByItem(item);
if (sfItem != null && !(sfItem instanceof NotPlaceable)){
BlockStorage.addBlockInfo(e.getBlock(), "id", sfItem.getName(), true);
if (SlimefunItem.blockhandler.containsKey(sfItem.getName())) {
SlimefunItem.blockhandler.get(sfItem.getName()).onPlace(e.getPlayer(), e.getBlock(), sfItem);
BlockStorage.addBlockInfo(e.getBlock(), "id", sfItem.getID(), true);
if (SlimefunItem.blockhandler.containsKey(sfItem.getID())) {
SlimefunItem.blockhandler.get(sfItem.getID()).onPlace(e.getPlayer(), e.getBlock(), sfItem);
}
}
else {
@ -177,8 +176,8 @@ public class ToolListener implements Listener {
if (StringUtils.equals(block2.getType().toString(), "SAPLING", "WOOD_PLATE", "STONE_PLATE", "IRON_PLATE", "GOLD_PLATE")) {
SlimefunItem sfItem = BlockStorage.check(e.getBlock().getRelative(BlockFace.UP));
if (sfItem != null && !(sfItem instanceof HandledBlock)) {
if (SlimefunItem.blockhandler.containsKey(sfItem.getName())) {
allow = SlimefunItem.blockhandler.get(sfItem.getName()).onBreak(e.getPlayer(), block2, sfItem, UnregisterReason.PLAYER_BREAK);
if (SlimefunItem.blockhandler.containsKey(sfItem.getID())) {
allow = SlimefunItem.blockhandler.get(sfItem.getID()).onBreak(e.getPlayer(), block2, sfItem, UnregisterReason.PLAYER_BREAK);
}
if (allow) {
block2.getWorld().dropItemNaturally(block2.getLocation(), BlockStorage.retrieve(block2));
@ -193,8 +192,8 @@ public class ToolListener implements Listener {
SlimefunItem sfItem = BlockStorage.check(e.getBlock());
if (sfItem != null && !(sfItem instanceof HandledBlock)) {
if (SlimefunItem.blockhandler.containsKey(sfItem.getName())) {
allow = SlimefunItem.blockhandler.get(sfItem.getName()).onBreak(e.getPlayer(), e.getBlock(), sfItem, UnregisterReason.PLAYER_BREAK);
if (SlimefunItem.blockhandler.containsKey(sfItem.getID())) {
allow = SlimefunItem.blockhandler.get(sfItem.getID()).onBreak(e.getPlayer(), e.getBlock(), sfItem, UnregisterReason.PLAYER_BREAK);
}
if (allow) {
drops.add(BlockStorage.retrieve(e.getBlock()));
@ -234,10 +233,10 @@ public class ToolListener implements Listener {
SlimefunItem item = BlockStorage.check(block);
if (item != null) {
blocks.remove();
if (!item.getName().equalsIgnoreCase("HARDENED_GLASS") && !item.getName().equalsIgnoreCase("WITHER_PROOF_OBSIDIAN") && !item.getName().equalsIgnoreCase("WITHER_PROOF_GLASS") && !item.getName().equalsIgnoreCase("FORCEFIELD_PROJECTOR") && !item.getName().equalsIgnoreCase("FORCEFIELD_RELAY")) {
if (!item.getID().equalsIgnoreCase("HARDENED_GLASS") && !item.getID().equalsIgnoreCase("WITHER_PROOF_OBSIDIAN") && !item.getID().equalsIgnoreCase("WITHER_PROOF_GLASS") && !item.getID().equalsIgnoreCase("FORCEFIELD_PROJECTOR") && !item.getID().equalsIgnoreCase("FORCEFIELD_RELAY")) {
boolean success = true;
if (SlimefunItem.blockhandler.containsKey(item.getName())) {
success = SlimefunItem.blockhandler.get(item.getName()).onBreak(null, block, item, UnregisterReason.EXPLODE);
if (SlimefunItem.blockhandler.containsKey(item.getID())) {
success = SlimefunItem.blockhandler.get(item.getID()).onBreak(null, block, item, UnregisterReason.EXPLODE);
}
if (success) {
BlockStorage.clearBlockInfo(block);