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

Using 1.13 Materials for Machines

Browse Source
This commit is contained in:
MisterErwin 2018-09-04 18:54:12 +02:00 committed by TheBusyBiscuit
parent 9ab28ad47c
commit 860a2dfe09
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java
View File

@ -160,7 +160,7 @@ public abstract class HeatedPressureChamber extends AContainer {
else progress.put(b, timeleft - 1);
}
else {
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 15), " "));
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "));
pushItems(b, processing.get(b).getOutput());
progress.remove(b);

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

@ -77,7 +77,7 @@ public abstract class OilPump extends AContainer {
@Override
public ItemStack getProgressBar() {
return new ItemStack(Material.DIAMOND_SPADE);
return new ItemStack(Material.DIAMOND_SHOVEL);
}
@Override
@ -107,7 +107,7 @@ public abstract class OilPump extends AContainer {
progress.put(b, timeleft - 1);
}
else {
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 15), " "));
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "));
pushItems(b, processing.get(b).getOutput());
progress.remove(b);

10
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ReactorAccessPort.java
View File

@ -107,7 +107,7 @@ public class ReactorAccessPort extends SlimefunItem {
@SuppressWarnings("deprecation")
private void constructMenu(BlockMenuPreset preset) {
for (int i: border) {
preset.addItem(i, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 7), " "),
preset.addItem(i, new CustomItem(new MaterialData(Material.GRAY_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -119,7 +119,7 @@ public class ReactorAccessPort extends SlimefunItem {
}
for (int i: border_1) {
preset.addItem(i, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 5), " "),
preset.addItem(i, new CustomItem(new MaterialData(Material.LIME_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -131,7 +131,7 @@ public class ReactorAccessPort extends SlimefunItem {
}
for (int i: border_2) {
preset.addItem(i, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 9), " "),
preset.addItem(i, new CustomItem(new MaterialData(Material.CYAN_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -143,7 +143,7 @@ public class ReactorAccessPort extends SlimefunItem {
}
for (int i: border_3) {
preset.addItem(i, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 13), " "),
preset.addItem(i, new CustomItem(new MaterialData(Material.GREEN_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -219,7 +219,7 @@ public class ReactorAccessPort extends SlimefunItem {
int size = BlockStorage.getInventory(l).toInventory().getSize();
Inventory inv = Bukkit.createInventory(null, size);
for (int i = 0; i < size; i++) {
inv.setItem(i, new CustomItem(Material.COMMAND, " &4ALL YOUR PLACEHOLDERS ARE BELONG TO US", 0));
inv.setItem(i, new CustomItem(Material.COMMAND_BLOCK, " &4ALL YOUR PLACEHOLDERS ARE BELONG TO US", 0));
}
for (int slot: getOutputSlots()) {
inv.setItem(slot, BlockStorage.getInventory(l).getItemInSlot(slot));

2
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java
View File

@ -71,7 +71,7 @@ public abstract class Refinery extends AContainer {
else progress.put(b, timeleft - 1);
}
else {
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 15), " "));
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "));
pushItems(b, processing.get(b).getOutput());
progress.remove(b);

2
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/TrashCan.java
View File

@ -53,7 +53,7 @@ public class TrashCan extends SlimefunItem {
@SuppressWarnings("deprecation")
private void constructMenu(BlockMenuPreset preset) {
for (int i: border) {
preset.addItem(i, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 14), " "),
preset.addItem(i, new CustomItem(new MaterialData(Material.RED_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override

18
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/WitherAssembler.java
View File

@ -53,7 +53,7 @@ public class WitherAssembler extends SlimefunItem {
public void newInstance(final BlockMenu menu, final Block b) {
try {
if (!BlockStorage.hasBlockInfo(b) || BlockStorage.getLocationInfo(b.getLocation(), "enabled") == null || BlockStorage.getLocationInfo(b.getLocation(), "enabled").equals("false")) {
menu.replaceExistingItem(22, new CustomItem(new MaterialData(Material.SULPHUR), "&7Enabled: &4\u2718", "", "&e> Click to enable this Machine"));
menu.replaceExistingItem(22, new CustomItem(new MaterialData(Material.GUNPOWDER), "&7Enabled: &4\u2718", "", "&e> Click to enable this Machine"));
menu.addMenuClickHandler(22, new MenuClickHandler() {
@Override
@ -79,7 +79,7 @@ public class WitherAssembler extends SlimefunItem {
double offset = (!BlockStorage.hasBlockInfo(b) || BlockStorage.getLocationInfo(b.getLocation(), "offset") == null) ? 3.0F: Double.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "offset"));
menu.replaceExistingItem(31, new CustomItem(new MaterialData(Material.PISTON_BASE), "&7Offset: &3" + offset + " Block(s)", "", "&rLeft Click: &7+0.1", "&rRight Click: &7-0.1"));
menu.replaceExistingItem(31, new CustomItem(new MaterialData(Material.PISTON), "&7Offset: &3" + offset + " Block(s)", "", "&rLeft Click: &7+0.1", "&rRight Click: &7-0.1"));
menu.addMenuClickHandler(31, new MenuClickHandler() {
@Override
@ -150,7 +150,7 @@ public class WitherAssembler extends SlimefunItem {
@SuppressWarnings("deprecation")
private void constructMenu(BlockMenuPreset preset) {
for (int i: border) {
preset.addItem(i, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 7), " "),
preset.addItem(i, new CustomItem(new MaterialData(Material.GRAY_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -162,7 +162,7 @@ public class WitherAssembler extends SlimefunItem {
}
for (int i: border_1) {
preset.addItem(i, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 15), " "),
preset.addItem(i, new CustomItem(new MaterialData(Material.BLACK_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -174,7 +174,7 @@ public class WitherAssembler extends SlimefunItem {
}
for (int i: border_2) {
preset.addItem(i, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 12), " "),
preset.addItem(i, new CustomItem(new MaterialData(Material.BROWN_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -185,7 +185,7 @@ public class WitherAssembler extends SlimefunItem {
});
}
preset.addItem(1, new CustomItem(new MaterialData(Material.SKULL_ITEM, (byte) 1), "&7Wither Skull Slot", "", "&rThis Slot accepts Wither Skeleton Skulls"),
preset.addItem(1, new CustomItem(new MaterialData(Material.WITHER_SKELETON_SKULL, (byte) 1), "&7Wither Skull Slot", "", "&rThis Slot accepts Wither Skeleton Skulls"),
new MenuClickHandler() {
@Override
@ -205,7 +205,7 @@ public class WitherAssembler extends SlimefunItem {
});
preset.addItem(13, new CustomItem(new MaterialData(Material.WATCH), "&7Cooldown: &b30 Seconds", "", "&rThis Machine takes up to half a Minute to operate", "&rso give it some Time!"),
preset.addItem(13, new CustomItem(new MaterialData(Material.CLOCK), "&7Cooldown: &b30 Seconds", "", "&rThis Machine takes up to half a Minute to operate", "&rso give it some Time!"),
new MenuClickHandler() {
@Override
@ -257,7 +257,7 @@ public class WitherAssembler extends SlimefunItem {
}
for (int slot: getWitherSkullSlots()) {
if (SlimefunManager.isItemSimiliar(BlockStorage.getInventory(b).getItemInSlot(slot), new MaterialData(Material.SKULL_ITEM, (byte) 1).toItemStack(1), true, DataType.ALWAYS)) {
if (SlimefunManager.isItemSimiliar(BlockStorage.getInventory(b).getItemInSlot(slot), new MaterialData(Material.WITHER_SKELETON_SKULL, (byte) 1).toItemStack(1), true, DataType.ALWAYS)) {
skulls = skulls + BlockStorage.getInventory(b).getItemInSlot(slot).getAmount();
if (skulls > 2) {
skulls = 3;
@ -282,7 +282,7 @@ public class WitherAssembler extends SlimefunItem {
}
for (int slot: getWitherSkullSlots()) {
if (SlimefunManager.isItemSimiliar(BlockStorage.getInventory(b).getItemInSlot(slot), new MaterialData(Material.SKULL_ITEM, (byte) 1).toItemStack(1), true, DataType.ALWAYS)) {
if (SlimefunManager.isItemSimiliar(BlockStorage.getInventory(b).getItemInSlot(slot), new MaterialData(Material.WITHER_SKELETON_SKULL, (byte) 1).toItemStack(1), true, DataType.ALWAYS)) {
final int amount = BlockStorage.getInventory(b).getItemInSlot(slot).getAmount();
if (amount >= skulls) {
BlockStorage.getInventory(b).replaceExistingItem(slot, InvUtils.decreaseItem(BlockStorage.getInventory(b).getItemInSlot(slot), skulls));

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/XPCollector.java
View File

@ -87,7 +87,7 @@ public class XPCollector extends SlimefunItem {
int size = BlockStorage.getInventory(b).toInventory().getSize();
Inventory inv = Bukkit.createInventory(null, size);
for (int i = 0; i < size; i++) {
inv.setItem(i, new CustomItem(Material.COMMAND, " &4ALL YOUR PLACEHOLDERS ARE BELONG TO US", 0));
inv.setItem(i, new CustomItem(Material.COMMAND_BLOCK, " &4ALL YOUR PLACEHOLDERS ARE BELONG TO US", 0));
}
for (int slot: getOutputSlots()) {
inv.setItem(slot, BlockStorage.getInventory(b).getItemInSlot(slot));
@ -115,7 +115,7 @@ public class XPCollector extends SlimefunItem {
@SuppressWarnings("deprecation")
protected void constructMenu(BlockMenuPreset preset) {
for (int i: border) {
preset.addItem(i, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 10), " "),
preset.addItem(i, new CustomItem(new MaterialData(Material.PURPLE_STAINED_GLASS_PANE), " "),
new MenuClickHandler() {
@Override
@ -172,9 +172,9 @@ public class XPCollector extends SlimefunItem {
int withdrawn = 0;
for (int level = 0; level < getEXP(b); level = level + 10) {
if (fits(b, new CustomItem(Material.EXP_BOTTLE, "&aFlask of Knowledge", 0))) {
if (fits(b, new CustomItem(Material.EXPERIENCE_BOTTLE, "&aFlask of Knowledge", 0))) {
withdrawn = withdrawn + 10;
pushItems(b, new CustomItem(Material.EXP_BOTTLE, "&aFlask of Knowledge", 0));
pushItems(b, new CustomItem(Material.EXPERIENCE_BOTTLE, "&aFlask of Knowledge", 0));
}
}
BlockStorage.addBlockInfo(b, "stored-exp", String.valueOf(xp - withdrawn));