mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Fixed Android Script Buttons being NULL
This commit is contained in:
parent
4d3943cd74
commit
f2fe5090d3
@ -157,8 +157,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
|
|||||||
@Override
|
@Override
|
||||||
public void newInstance(BlockMenu menu, final Block b) {
|
public void newInstance(BlockMenu menu, final Block b) {
|
||||||
try {
|
try {
|
||||||
menu.addItem(15, new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTAxYzdiNTcyNjE3ODk3NGIzYjNhMDFiNDJhNTkwZTU0MzY2MDI2ZmQ0MzgwOGYyYTc4NzY0ODg0M2E3ZjVhIn19fQ=="), "§aStart/Continue"),
|
menu.replaceExistingItem(15, new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTAxYzdiNTcyNjE3ODk3NGIzYjNhMDFiNDJhNTkwZTU0MzY2MDI2ZmQ0MzgwOGYyYTc4NzY0ODg0M2E3ZjVhIn19fQ=="), "§aStart/Continue"));
|
||||||
new MenuClickHandler() {
|
menu.addMenuClickHandler(15, new MenuClickHandler() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onClick(Player p, int arg1, ItemStack arg2, ClickAction arg3) {
|
public boolean onClick(Player p, int arg1, ItemStack arg2, ClickAction arg3) {
|
||||||
@ -169,8 +169,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
menu.addItem(17, new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTYxMzlmZDFjNTY1NGU1NmU5ZTRlMmM4YmU3ZWIyYmQ1YjQ5OWQ2MzM2MTY2NjNmZWVlOTliNzQzNTJhZDY0In19fQ=="), "§4Pause"),
|
menu.replaceExistingItem(17, new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTYxMzlmZDFjNTY1NGU1NmU5ZTRlMmM4YmU3ZWIyYmQ1YjQ5OWQ2MzM2MTY2NjNmZWVlOTliNzQzNTJhZDY0In19fQ=="), "§4Pause"));
|
||||||
new MenuClickHandler() {
|
menu.addMenuClickHandler(17, new MenuClickHandler() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onClick(Player p, int arg1, ItemStack arg2, ClickAction arg3) {
|
public boolean onClick(Player p, int arg1, ItemStack arg2, ClickAction arg3) {
|
||||||
@ -180,8 +180,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
menu.addItem(16, new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDc4ZjJiN2U1ZTc1NjM5ZWE3ZmI3OTZjMzVkMzY0YzRkZjI4YjQyNDNlNjZiNzYyNzdhYWRjZDYyNjEzMzcifX19"), "§bMemory Core", "", "§8\u21E8 §7Click to open the Script Editor"),
|
menu.replaceExistingItem(16, new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDc4ZjJiN2U1ZTc1NjM5ZWE3ZmI3OTZjMzVkMzY0YzRkZjI4YjQyNDNlNjZiNzYyNzdhYWRjZDYyNjEzMzcifX19"), "§bMemory Core", "", "§8\u21E8 §7Click to open the Script Editor"));
|
||||||
new MenuClickHandler() {
|
menu.addMenuClickHandler(16, new MenuClickHandler() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onClick(Player p, int arg1, ItemStack arg2, ClickAction arg3) {
|
public boolean onClick(Player p, int arg1, ItemStack arg2, ClickAction arg3) {
|
||||||
|
@ -5,15 +5,16 @@ import java.util.HashSet;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu;
|
|
||||||
import me.mrCookieSlime.Slimefun.SlimefunStartup;
|
|
||||||
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.Location;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.ChestMenu;
|
||||||
|
import me.mrCookieSlime.Slimefun.SlimefunStartup;
|
||||||
|
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
||||||
|
|
||||||
public abstract class BlockMenuPreset extends ChestMenu {
|
public abstract class BlockMenuPreset extends ChestMenu {
|
||||||
|
|
||||||
public static Map<String, BlockMenuPreset> presets = new HashMap<String, BlockMenuPreset>();
|
public static Map<String, BlockMenuPreset> presets = new HashMap<String, BlockMenuPreset>();
|
||||||
@ -123,11 +124,8 @@ public abstract class BlockMenuPreset extends ChestMenu {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (size > -1) menu.addItem(size - 1, null);
|
if (size > -1) menu.addItem(size - 1, null);
|
||||||
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new Runnable() {
|
|
||||||
|
|
||||||
@Override
|
newInstance(menu, menu.getLocation());
|
||||||
public void run() {
|
|
||||||
newInstance(menu, menu.getBlock());
|
|
||||||
for (int slot = 0; slot < 54; slot++) {
|
for (int slot = 0; slot < 54; slot++) {
|
||||||
if (getMenuClickHandler(slot) != null) menu.addMenuClickHandler(slot, getMenuClickHandler(slot));
|
if (getMenuClickHandler(slot) != null) menu.addMenuClickHandler(slot, getMenuClickHandler(slot));
|
||||||
}
|
}
|
||||||
@ -136,8 +134,6 @@ public abstract class BlockMenuPreset extends ChestMenu {
|
|||||||
menu.addMenuCloseHandler(getMenuCloseHandler());
|
menu.addMenuCloseHandler(getMenuCloseHandler());
|
||||||
menu.registerEvent(event);
|
menu.registerEvent(event);
|
||||||
}
|
}
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void clone(UniversalBlockMenu menu) {
|
public void clone(UniversalBlockMenu menu) {
|
||||||
menu.setPlayerInventoryClickable(true);
|
menu.setPlayerInventoryClickable(true);
|
||||||
@ -160,4 +156,12 @@ public abstract class BlockMenuPreset extends ChestMenu {
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void newInstance(final BlockMenu menu, final Location l) {
|
||||||
|
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, new Runnable() {
|
||||||
|
public void run() {
|
||||||
|
newInstance(menu, l.getBlock());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
name: Slimefun
|
name: Slimefun
|
||||||
version: 4.0.3
|
version: 4.0.4
|
||||||
author: mrCookieSlime
|
author: mrCookieSlime
|
||||||
description: Slimefun basically turns your entire Server into a FTB modpack without installing a single mod
|
description: Slimefun basically turns your entire Server into a FTB modpack without installing a single mod
|
||||||
website: http://mrcookieslime.github.io/
|
website: http://mrcookieslime.github.io/
|
||||||
|
Loading…
Reference in New Issue
Block a user