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

Code cleanup + MaterialHelper

Browse Source
This commit is contained in:
MisterErwin 2018-09-05 16:16:29 +02:00 committed by TheBusyBiscuit
parent dc19e969aa
commit c0e51f2458
12 changed files with 93 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/me/mrCookieSlime/Slimefun/Android/ProgrammableAndroid.java
View File

@ -1,8 +1,42 @@
package me.mrCookieSlime.Slimefun.Android;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.Sound;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Dispenser;
import org.bukkit.block.Skull;
import org.bukkit.entity.Ageable;
import org.bukkit.entity.Animals;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Monster;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.FixedMetadataValue;
import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHook;
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
import me.mrCookieSlime.CSCoreLibPlugin.general.Block.TreeCalculator;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.AdvancedMenuClickHandler;
@ -10,11 +44,12 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.MenuClickHan
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.MenuOpeningHandler;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ClickAction;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.InvUtils;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.MenuHelper;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.MenuHelper.ChatHandler;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem;
import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull;
import me.mrCookieSlime.ExoticGarden.ExoticGarden;
import me.mrCookieSlime.Slimefun.SlimefunStartup;
import me.mrCookieSlime.Slimefun.Android.ScriptComparators.ScriptReputationSorter;
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
@ -26,33 +61,17 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers.BlockTicker;
import me.mrCookieSlime.Slimefun.Setup.Messages;
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
import me.mrCookieSlime.Slimefun.SlimefunStartup;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
import me.mrCookieSlime.Slimefun.holograms.AndroidStatusHologram;
import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Dispenser;
import org.bukkit.block.Skull;
import org.bukkit.entity.*;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;
import org.bukkit.metadata.FixedMetadataValue;
import java.io.File;
import java.util.*;
public abstract class ProgrammableAndroid extends SlimefunItem {
private static final int[] border = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 18, 24, 25, 26, 27, 33, 35, 36, 42, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53};
private static final int[] border_out = {10, 11, 12, 13, 14, 19, 23, 28, 32, 37, 38, 39, 40, 41};
@SuppressWarnings("deprecation")
private static final ItemStack[] fish = new ItemStack[] {new ItemStack(Material.COD), new ItemStack(Material.SALMON), new ItemStack(Material.PUFFERFISH), new ItemStack(Material.TROPICAL_FISH), new ItemStack(Material.STRING), new ItemStack(Material.BONE), new ItemStack(Material.STICK)};
private static final List<BlockFace> directions = Arrays.asList(BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST);
@ -87,8 +106,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
if (getTier() == 1) {
registerFuel(new MachineFuel(80, new MaterialData(Material.COAL).toItemStack(1)));
registerFuel(new MachineFuel(80, new MaterialData(Material.CHARCOAL).toItemStack(1)));
registerFuel(new MachineFuel(80, new ItemStack(Material.COAL)));
registerFuel(new MachineFuel(80, new ItemStack(Material.CHARCOAL)));
registerFuel(new MachineFuel(800, new ItemStack(Material.COAL_BLOCK)));
registerFuel(new MachineFuel(45, new ItemStack(Material.BLAZE_ROD)));
@ -442,7 +461,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
case CHOP_TREE: {
BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"));
Block block = b.getRelative(face);
if (MaterialHook.isLog( block.getType())) {
if (MaterialHelper.isLog( block.getType())) {
List<Location> list = new ArrayList<Location>();
list.add(block.getLocation());
TreeCalculator.getTree(block.getLocation(), block.getLocation(), list);
@ -457,7 +476,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
pushItems(b, items);
log.getWorld().playEffect(log.getLocation(), Effect.STEP_SOUND, log.getType());
if (log.getY() == block.getY()) {
log.setType(MaterialHook.getSaplingFromLog(log.getType()));
log.setType(MaterialHelper.getSaplingFromLog(log.getType()));
}
else log.setType(Material.AIR);
}
@ -792,7 +811,6 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
return ageable.getAge() >= ageable.getMaximumAge();
}
@SuppressWarnings("deprecation")
private void farm(Block b, Block block) {
switch (block.getType()) {
case WHEAT: {
@ -850,7 +868,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
}
case COCOA: {
if (isFullGrown(block)) {
ItemStack drop = new MaterialData(Material.COCOA).toItemStack(CSCoreLib.randomizer().nextInt(3) + 1);
ItemStack drop = new ItemStack(Material.COCOA_BEANS, CSCoreLib.randomizer().nextInt(3) + 1);
if (fits(b, drop)) {
pushItems(b, drop);
org.bukkit.block.data.Ageable ageable = (org.bukkit.block.data.Ageable)block.getBlockData();
@ -890,7 +908,6 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
}
}
@SuppressWarnings("deprecation")
private void constructMenu(BlockMenuPreset preset) throws Exception {
for (int i: border) {
preset.addItem(i, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
@ -1115,7 +1132,6 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
menu.open(p);
}
@SuppressWarnings("deprecation")
private void openScriptDownloader(final Player p, final Block b, final int page) throws Exception {
final ChestMenu menu = new ChestMenu("Slimefun Guide");
@ -1337,7 +1353,6 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
return progress;
}
@SuppressWarnings("deprecation")
protected void openScriptComponentEditor(Player p, final Block b, final String script, final int index) throws Exception {
ChestMenu menu = new ChestMenu("&eScript Editor");

10
src/me/mrCookieSlime/Slimefun/Objects/MultiBlock.java
View File

@ -3,7 +3,7 @@ package me.mrCookieSlime.Slimefun.Objects;
import java.util.ArrayList;
import java.util.List;
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHook;
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunMachine;
@ -45,8 +45,8 @@ public class MultiBlock {
if (trigger == mb.getTriggerBlock()) {
for (int i = 0; i < mb.getBuild().length; i++) {
if (mb.getBuild()[i] != null) {
if (MaterialHook.isLog( mb.getBuild()[i])) {
if (!MaterialHook.isLog(blocks[i])) return false;
if (MaterialHelper.isLog( mb.getBuild()[i])) {
if (!MaterialHelper.isLog(blocks[i])) return false;
}
else if (mb.getBuild()[i] != blocks[i]) return false;
}
@ -63,8 +63,8 @@ public class MultiBlock {
else if (trigger == mb.getTriggerBlock()) {
for (int i = 0; i < mb.getBuild().length; i++) {
if (mb.getBuild()[i] != null) {
if (MaterialHook.isLog(mb.getBuild()[i])) {
if (!MaterialHook.isLog(blocks[i])) return false;
if (MaterialHelper.isLog(mb.getBuild()[i])) {
if (!MaterialHelper.isLog(blocks[i])) return false;
}
else if (mb.getBuild()[i] != blocks[i]) return false;
}

30
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
View File

@ -5,6 +5,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.AdvancedMenuClickHandler;
@ -25,16 +34,6 @@ import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.MaterialData;
public abstract class AContainer extends SlimefunItem {
public static Map<Block, MachineRecipe> processing = new HashMap<Block, MachineRecipe>();
@ -164,10 +163,9 @@ public abstract class AContainer extends SlimefunItem {
this.registerDefaultRecipes();
}
@SuppressWarnings("deprecation")
protected void constructMenu(BlockMenuPreset preset) {
for (int i: border) {
preset.addItem(i, new CustomItem(new MaterialData(Material.GRAY_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -178,7 +176,7 @@ public abstract class AContainer extends SlimefunItem {
});
}
for (int i: border_in) {
preset.addItem(i, new CustomItem(new MaterialData(Material.CYAN_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -189,7 +187,7 @@ public abstract class AContainer extends SlimefunItem {
});
}
for (int i: border_out) {
preset.addItem(i, new CustomItem(new MaterialData(Material.ORANGE_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.ORANGE_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -200,7 +198,7 @@ public abstract class AContainer extends SlimefunItem {
});
}
preset.addItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "),
preset.addItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -331,7 +329,7 @@ public abstract class AContainer extends SlimefunItem {
else progress.put(b, timeleft - 1);
}
else {
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "));
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "));
pushItems(b, processing.get(b).getOutput().clone());
progress.remove(b);

10
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java
View File

@ -9,7 +9,6 @@ import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.MaterialData;
import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ClickAction;
@ -45,10 +44,9 @@ public abstract class ADrill extends AContainer {
this.constructMenu(this);
}
@SuppressWarnings("deprecation")
private void constructMenu(BlockMenuPreset preset) {
for (int i: border) {
preset.addItem(i, new CustomItem(new MaterialData(Material.GRAY_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -59,7 +57,7 @@ public abstract class ADrill extends AContainer {
});
}
for (int i: border_out) {
preset.addItem(i, new CustomItem(new MaterialData(Material.ORANGE_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.ORANGE_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -70,7 +68,7 @@ public abstract class ADrill extends AContainer {
});
}
preset.addItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "),
preset.addItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -153,7 +151,7 @@ public abstract class ADrill extends AContainer {
progress.put(b, timeleft - 1);
}
else {
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "));
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "));
pushItems(b, processing.get(b).getOutput());
progress.remove(b);

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AFarm.java
View File

@ -26,7 +26,6 @@ import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;
public abstract class AFarm extends SlimefunItem {
@ -131,10 +130,9 @@ public abstract class AFarm extends SlimefunItem {
});
}
@SuppressWarnings("deprecation")
private void constructMenu(BlockMenuPreset preset) {
for (int i: border) {
preset.addItem(i, new CustomItem(new MaterialData(Material.GRAY_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -145,7 +143,7 @@ public abstract class AFarm extends SlimefunItem {
});
}
for (int i: border_out) {
preset.addItem(i, new CustomItem(new MaterialData(Material.ORANGE_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.ORANGE_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -156,7 +154,7 @@ public abstract class AFarm extends SlimefunItem {
});
}
preset.addItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "),
preset.addItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override

12
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java
View File

@ -37,7 +37,6 @@ import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.MaterialData;
public abstract class AGenerator extends SlimefunItem {
@ -168,10 +167,9 @@ public abstract class AGenerator extends SlimefunItem {
this.registerDefaultRecipes();
}
@SuppressWarnings("deprecation")
private void constructMenu(BlockMenuPreset preset) {
for (int i: border) {
preset.addItem(i, new CustomItem(new MaterialData(Material.GRAY_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -182,7 +180,7 @@ public abstract class AGenerator extends SlimefunItem {
});
}
for (int i: border_in) {
preset.addItem(i, new CustomItem(new MaterialData(Material.CYAN_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -193,7 +191,7 @@ public abstract class AGenerator extends SlimefunItem {
});
}
for (int i: border_out) {
preset.addItem(i, new CustomItem(new MaterialData(Material.ORANGE_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.ORANGE_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -219,7 +217,7 @@ public abstract class AGenerator extends SlimefunItem {
});
}
preset.addItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "),
preset.addItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -302,7 +300,7 @@ public abstract class AGenerator extends SlimefunItem {
else if (SlimefunManager.isItemSimiliar(fuel, SlimefunItems.BUCKET_OF_OIL, true)) {
pushItems(l, new ItemStack[] {new ItemStack(Material.BUCKET)});
}
BlockStorage.getInventory(l).replaceExistingItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "));
BlockStorage.getInventory(l).replaceExistingItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "));
progress.remove(l);
processing.remove(l);

16
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java
View File

@ -16,7 +16,6 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.MaterialData;
import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
@ -162,10 +161,9 @@ public abstract class AReactor extends SlimefunItem {
this.registerDefaultRecipes();
}
@SuppressWarnings("deprecation")
private void constructMenu(BlockMenuPreset preset) {
for (int i: border) {
preset.addItem(i, new CustomItem(new MaterialData(Material.GRAY_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -177,7 +175,7 @@ public abstract class AReactor extends SlimefunItem {
}
for (int i: border_1) {
preset.addItem(i, new CustomItem(new MaterialData(Material.LIME_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.LIME_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -189,7 +187,7 @@ public abstract class AReactor extends SlimefunItem {
}
for (int i: border_3) {
preset.addItem(i, new CustomItem(new MaterialData(Material.GREEN_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.GREEN_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -200,7 +198,7 @@ public abstract class AReactor extends SlimefunItem {
});
}
preset.addItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "),
preset.addItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -221,7 +219,7 @@ public abstract class AReactor extends SlimefunItem {
});
for (int i : border_2) {
preset.addItem(i, new CustomItem(new MaterialData(Material.CYAN_STAINED_GLASS_PANE), " "),
preset.addItem(i, new CustomItem(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -236,7 +234,7 @@ public abstract class AReactor extends SlimefunItem {
preset.addItem(7, new CustomItem(this.getCoolant(), "&bCoolant Slot", "", "&rThis Slot accepts Coolant Cells", "&4Without any Coolant Cells, your Reactor", "&4will explode"));
}
else {
preset.addItem(7, new CustomItem(new MaterialData(Material.BARRIER), "&bCoolant Slot", "", "&rThis Slot accepts Coolant Cells"));
preset.addItem(7, new CustomItem(new ItemStack(Material.BARRIER), "&bCoolant Slot", "", "&rThis Slot accepts Coolant Cells"));
for (int i : border_4) {
preset.addItem(i, new CustomItem(new ItemStack(Material.BARRIER), "&cNo Coolant Required"),
@ -376,7 +374,7 @@ public abstract class AReactor extends SlimefunItem {
return 0;
}
else {
BlockStorage.getInventory(l).replaceExistingItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "));
BlockStorage.getInventory(l).replaceExistingItem(22, new CustomItem(new ItemStack(Material.BLACK_STAINED_GLASS_PANE), " "));
if (processing.get(l).getOutput() != null) pushItems(l, processing.get(l).getOutput());
if (port != null) {

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectrifiedCrucible.java
View File

@ -1,6 +1,6 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines;
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHook;
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
@ -18,7 +18,7 @@ public abstract class ElectrifiedCrucible extends AContainer {
public void registerDefaultRecipes() {
registerRecipe(10, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(Material.COBBLESTONE, 16)}, new ItemStack[]{new ItemStack(Material.LAVA_BUCKET)});
registerRecipe(8, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(Material.TERRACOTTA, 12)}, new ItemStack[]{new ItemStack(Material.LAVA_BUCKET)});
for (Material coloured_terracotta : MaterialHook.TerracottaColours){
for (Material coloured_terracotta : MaterialHelper.TerracottaColours){
registerRecipe(8, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(coloured_terracotta, 12)}, new ItemStack[]{new ItemStack(Material.LAVA_BUCKET)});
}
registerRecipe(10, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(Material.OAK_LEAVES, 16)}, new ItemStack[]{new ItemStack(Material.WATER_BUCKET)});

19
src/me/mrCookieSlime/Slimefun/Objects/tasks/RainbowTicker.java
View File

@ -1,7 +1,7 @@
package me.mrCookieSlime.Slimefun.Objects.tasks;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHook;
import me.mrCookieSlime.CSCoreLibPlugin.compatibility.MaterialHelper;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers.BlockTicker;
@ -23,17 +23,16 @@ public class RainbowTicker extends BlockTicker {
index = 0;
}
@SuppressWarnings("deprecation")
@Override
public void tick(Block b, SlimefunItem item, Config data) {
if (MaterialHook.isWool(b.getType())){
b.setType(MaterialHook.WoolColours[meta], false);
}else if (MaterialHook.isStainedGlass(b.getType())) {
b.setType(MaterialHook.StainedGlassColours[meta], false);
}else if (MaterialHook.isStainedGlassPane(b.getType())){
b.setType(MaterialHook.StainedGlassPaneColours[meta], true);
}else if (MaterialHook.isTerracotta(b.getType())){
b.setType(MaterialHook.TerracottaColours[meta], false);
if (MaterialHelper.isWool(b.getType())){
b.setType(MaterialHelper.WoolColours[meta], false);
}else if (MaterialHelper.isStainedGlass(b.getType())) {
b.setType(MaterialHelper.StainedGlassColours[meta], false);
}else if (MaterialHelper.isStainedGlassPane(b.getType())){
b.setType(MaterialHelper.StainedGlassPaneColours[meta], true);
}else if (MaterialHelper.isTerracotta(b.getType())){
b.setType(MaterialHelper.TerracottaColours[meta], false);
}
}

5
src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java
View File

@ -21,7 +21,6 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.MaterialData;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu.MenuClickHandler;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ClickAction;
@ -49,7 +48,7 @@ public class CargoNet extends Network {
// Chest Terminal Stuff
private static final ChestTerminalSorter sorter = new ChestTerminalSorter();
public static final int[] terminal_slots = new int[] {0, 1, 2, 3, 4, 5, 6, 9, 10, 11, 12, 13, 14, 15, 18, 19, 20, 21, 22, 23, 24, 27, 28, 29, 30, 31, 32, 33, 36, 37, 38, 39, 40, 41, 42};
private static final ItemStack terminal_noitem_item = new CustomItem(new MaterialData(Material.BARRIER), "&4No Item cached");
private static final ItemStack terminal_noitem_item = new CustomItem(new ItemStack(Material.BARRIER), "&4No Item cached");
private static final MenuClickHandler terminal_noitem_handler = new MenuClickHandler() {
@Override
@ -536,8 +535,6 @@ public class CargoNet extends Network {
}
}
@SuppressWarnings("deprecation")
private static Block getAttachedBlock(Block block) {
if (block.getBlockData() instanceof Directional) {
return block.getRelative(((Directional) block.getBlockData()).getFacing().getOppositeFace());

1
src/me/mrCookieSlime/Slimefun/listeners/AutonomousToolsListener.java
View File

@ -22,7 +22,6 @@ public class AutonomousToolsListener implements Listener {
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@SuppressWarnings("deprecation")
@EventHandler
public void onBlockDispensing(final BlockDispenseEvent e) {
Block dispenser = e.getBlock();

1
src/me/mrCookieSlime/Slimefun/listeners/BlockListener.java
View File

@ -34,7 +34,6 @@ public class BlockListener implements Listener {
plugin.getServer().getPluginManager().registerEvents(this, plugin);
}
@SuppressWarnings("deprecation")
@EventHandler
public void onBlockFall(EntityChangeBlockEvent event) {
if (event.getEntity() instanceof FallingBlock) {