mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 11:45:51 +00:00
Re-added all the "this." to #register(boolean)
This commit is contained in:
parent
c95bafad6a
commit
05b1fe77a5
@ -219,43 +219,43 @@ public class SlimefunItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void register(boolean slimefun) {
|
public void register(boolean slimefun) {
|
||||||
addon = !slimefun;
|
this.addon = !slimefun;
|
||||||
try {
|
try {
|
||||||
if (recipe.length < 9) recipe = new ItemStack[] {null, null, null, null, null, null, null, null, null};
|
if (this.recipe.length < 9) this.recipe = new ItemStack[] {null, null, null, null, null, null, null, null, null};
|
||||||
all.add(this);
|
all.add(this);
|
||||||
|
|
||||||
SlimefunStartup.getItemCfg().setDefaultValue(id + ".enabled", true);
|
SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".enabled", true);
|
||||||
SlimefunStartup.getItemCfg().setDefaultValue(id + ".can-be-used-in-workbenches", replacing);
|
SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".can-be-used-in-workbenches", this.replacing);
|
||||||
SlimefunStartup.getItemCfg().setDefaultValue(id + ".hide-in-guide", hidden);
|
SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".hide-in-guide", this.hidden);
|
||||||
SlimefunStartup.getItemCfg().setDefaultValue(id + ".allow-enchanting", enchantable);
|
SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".allow-enchanting", this.enchantable);
|
||||||
SlimefunStartup.getItemCfg().setDefaultValue(id + ".allow-disenchanting", disenchantable);
|
SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".allow-disenchanting", this.disenchantable);
|
||||||
SlimefunStartup.getItemCfg().setDefaultValue(id + ".required-permission", permission);
|
SlimefunStartup.getItemCfg().setDefaultValue(this.id + ".required-permission", this.permission);
|
||||||
if (keys != null && values != null) {
|
if (this.keys != null && this.values != null) {
|
||||||
for (int i = 0; i < keys.length; i++) {
|
for (int i = 0; i < this.keys.length; i++) {
|
||||||
SlimefunStartup.getItemCfg().setDefaultValue(id + "." + keys[i], values[i]);
|
SlimefunStartup.getItemCfg().setDefaultValue(this.id + "." + this.keys[i], this.values[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (World world: Bukkit.getWorlds()) {
|
for (World world: Bukkit.getWorlds()) {
|
||||||
SlimefunStartup.getWhitelist().setDefaultValue(world.getName() + ".enabled", true);
|
SlimefunStartup.getWhitelist().setDefaultValue(world.getName() + ".enabled", true);
|
||||||
SlimefunStartup.getWhitelist().setDefaultValue(world.getName() + ".enabled-items." + id, true);
|
SlimefunStartup.getWhitelist().setDefaultValue(world.getName() + ".enabled-items." + this.id, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ticking && !SlimefunStartup.getCfg().getBoolean("URID.enable-tickers")) {
|
if (this.ticking && !SlimefunStartup.getCfg().getBoolean("URID.enable-tickers")) {
|
||||||
state = State.DISABLED;
|
this.state = State.DISABLED;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SlimefunStartup.getItemCfg().getBoolean(id + ".enabled")) {
|
if (SlimefunStartup.getItemCfg().getBoolean(id + ".enabled")) {
|
||||||
if (!Category.list().contains(category)) category.register();
|
if (!Category.list().contains(category)) category.register();
|
||||||
|
|
||||||
state = State.ENABLED;
|
this.tate = State.ENABLED;
|
||||||
|
|
||||||
replacing = SlimefunStartup.getItemCfg().getBoolean(id + ".can-be-used-in-workbenches");
|
this.replacing = SlimefunStartup.getItemCfg().getBoolean(this.id + ".can-be-used-in-workbenches");
|
||||||
hidden = SlimefunStartup.getItemCfg().getBoolean(id + ".hide-in-guide");
|
this.hidden = SlimefunStartup.getItemCfg().getBoolean(this.id + ".hide-in-guide");
|
||||||
enchantable = SlimefunStartup.getItemCfg().getBoolean(id + ".allow-enchanting");
|
this.enchantable = SlimefunStartup.getItemCfg().getBoolean(this.id + ".allow-enchanting");
|
||||||
disenchantable = SlimefunStartup.getItemCfg().getBoolean(id + ".allow-disenchanting");
|
this.disenchantable = SlimefunStartup.getItemCfg().getBoolean(this.id + ".allow-disenchanting");
|
||||||
permission = SlimefunStartup.getItemCfg().getString(id + ".required-permission");
|
this.permission = SlimefunStartup.getItemCfg().getString(this.id + ".required-permission");
|
||||||
items.add(this);
|
items.add(this);
|
||||||
if (slimefun) vanilla++;
|
if (slimefun) vanilla++;
|
||||||
map_id.put(id, urid);
|
map_id.put(id, urid);
|
||||||
@ -268,8 +268,8 @@ public class SlimefunItem {
|
|||||||
|
|
||||||
if (SlimefunStartup.getCfg().getBoolean("options.print-out-loading")) System.out.println("[Slimefun] Loaded Item \"" + this.getID() + "\"");
|
if (SlimefunStartup.getCfg().getBoolean("options.print-out-loading")) System.out.println("[Slimefun] Loaded Item \"" + this.getID() + "\"");
|
||||||
} else {
|
} else {
|
||||||
if (this instanceof VanillaItem) state = State.VANILLA;
|
if (this instanceof VanillaItem) this.state = State.VANILLA;
|
||||||
else state = State.DISABLED;
|
else this.state = State.DISABLED;
|
||||||
}
|
}
|
||||||
} catch(Exception x) {
|
} catch(Exception x) {
|
||||||
System.err.println("[Slimefun] Item Registration failed: " + id);
|
System.err.println("[Slimefun] Item Registration failed: " + id);
|
||||||
|
Loading…
Reference in New Issue
Block a user