mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Merge pull request #20 from John000708/master

Browse Source 
Fixed 1 bug and added a new feature.
This commit is contained in:
TheBusyBiscuit 2016-10-28 19:49:15 +02:00 committed by GitHub
commit abc94186f4
3 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.yml
View File

@ -1,6 +1,7 @@
options:
auto-update: true
armor-update-interval: 10
allow-vanilla-disenchanting-only: false
give-guide-on-first-join: true
print-out-loading: false
enable-armor-effects: true

21
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoDisenchanter.java
View File

@ -13,9 +13,11 @@ import me.mrCookieSlime.EmeraldEnchants.EmeraldEnchants;
import me.mrCookieSlime.EmeraldEnchants.ItemEnchantment;
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
import me.mrCookieSlime.Slimefun.Objects.Category;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
import me.mrCookieSlime.Slimefun.SlimefunStartup;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.Slimefun;
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
@ -29,14 +31,16 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.MaterialData;
public class AutoDisenchanter extends AContainer {
private boolean allowSlimefunItems;
public AutoDisenchanter(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, name, recipeType, recipe);
allowSlimefunItems = !SlimefunStartup.getCfg().getBoolean("options.allow-vanilla-disenchanting-only");
}
@Override
public String getInventoryTitle() {
return "§5Auto-Disenchanter";
return "§5Auto-Disenchanter";
}
@Override
@ -51,7 +55,7 @@ public class AutoDisenchanter extends AContainer {
public int getEnergyConsumption() {
return 9;
}
@SuppressWarnings("deprecation")
@Override
protected void tick(Block b) {
@ -68,9 +72,9 @@ public class AutoDisenchanter extends AContainer {
lore.add(MachineHelper.getTimeLeft(timeleft / 2));
im.setLore(lore);
item.setItemMeta(im);
BlockStorage.getInventory(b).replaceExistingItem(22, item);
if (ChargableBlock.isChargable(b)) {
if (ChargableBlock.getCharge(b) < getEnergyConsumption()) return;
ChargableBlock.addCharge(b, -getEnergyConsumption());
@ -81,7 +85,7 @@ public class AutoDisenchanter extends AContainer {
else {
BlockStorage.getInventory(b).replaceExistingItem(22, new CustomItem(new MaterialData(Material.STAINED_GLASS_PANE, (byte) 15), " "));
pushItems(b, processing.get(b).getOutput());
progress.remove(b);
processing.remove(b);
}
@ -94,9 +98,10 @@ public class AutoDisenchanter extends AContainer {
for (int slot: getInputSlots()) {
ItemStack target = BlockStorage.getInventory(b).getItemInSlot(slot == getInputSlots()[0] ? getInputSlots()[1]: getInputSlots()[0]);
ItemStack item = BlockStorage.getInventory(b).getItemInSlot(slot);
if(!allowSlimefunItems && SlimefunItem.getByItem(item) != null) return;
if (item != null && target != null && target.getType() == Material.BOOK) {
int amount = 0;
for (Map.Entry<Enchantment, Integer> e: item.getEnchantments().entrySet()) {
enchantments.put(e.getKey(), e.getValue());
amount++;
@ -118,7 +123,7 @@ public class AutoDisenchanter extends AContainer {
meta.addStoredEnchant(e.getKey(), e.getValue(), true);
}
book.setItemMeta(meta);
for (ItemEnchantment e: enchantments2) {
EmeraldEnchants.getInstance().getRegistry().applyEnchantment(book, e.getEnchantment(), e.getLevel());
EmeraldEnchants.getInstance().getRegistry().applyEnchantment(newItem, e.getEnchantment(), 0);
@ -128,7 +133,7 @@ public class AutoDisenchanter extends AContainer {
}
}
}
if (r != null) {
if (!fits(b, r.getOutput())) return;
for (int slot: getInputSlots()) {

60
src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
View File

@ -647,11 +647,11 @@ public class SlimefunSetup {
for (ItemStack converting: inputs.get(i)) {
if (converting != null) {
for (int j = 0; j < inv.getContents().length; j++) {
if (j == (inv.getContents().length - 1) && !SlimefunManager.isItemSimiliar(converting, inv.getContents()[j], true)) {
if (j == (inv.getContents().length - 1) && !SlimefunManager.isItemSimiliar(converting, inv.getContents()[j], true, SlimefunManager.DataType.ALWAYS)) {
craft = false;
break;
}
else if (SlimefunManager.isItemSimiliar(inv.getContents()[j], converting, true)) break;
else if (SlimefunManager.isItemSimiliar(inv.getContents()[j], converting, true, SlimefunManager.DataType.ALWAYS)) break;
}
}
}
@ -2992,7 +2992,7 @@ public class SlimefunSetup {
new ItemStack[] {null, new ItemStack(Material.ENCHANTMENT_TABLE), null, SlimefunItems.MAGIC_LUMP_3, SlimefunItems.GOLD_8K, SlimefunItems.MAGIC_LUMP_3, new ItemStack(Material.OBSIDIAN), SlimefunItems.GOLD_8K, new ItemStack(Material.OBSIDIAN)})
.register(true);
new SlimefunItem(Categories.BIRTHDAY, new CustomItem(new MaterialData(Material.CAKE), "§bBirthday Cake"), "BIRTHDAY_CAKE", RecipeType.ENHANCED_CRAFTING_TABLE,
new SlimefunItem(Categories.BIRTHDAY, new CustomItem(new MaterialData(Material.CAKE), "§bBirthday Cake"), "BIRTHDAY_CAKE", RecipeType.ENHANCED_CRAFTING_TABLE,
new ItemStack[] {null, new ItemStack(Material.TORCH), null, new ItemStack(Material.SUGAR), new ItemStack(Material.CAKE), new ItemStack(Material.SUGAR), null, null, null})
.register(true);
@ -3152,7 +3152,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§bElectric Furnace";
return "§bElectric Furnace";
}
@Override
@ -3177,7 +3177,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§bElectric Furnace";
return "§bElectric Furnace";
}
@Override
@ -3202,7 +3202,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§bElectric Furnace";
return "§bElectric Furnace";
}
@Override
@ -3311,7 +3311,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cElectric Ingot Factory";
return "§cElectric Ingot Factory";
}
@Override
@ -3336,7 +3336,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cElectric Ingot Factory";
return "§cElectric Ingot Factory";
}
@Override
@ -3361,7 +3361,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cElectric Ingot Factory";
return "§cElectric Ingot Factory";
}
@Override
@ -3390,7 +3390,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§bElectric Ore Grinder";
return "§bElectric Ore Grinder";
}
@Override
@ -3424,7 +3424,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§bElectric Ore Grinder";
return "§bElectric Ore Grinder";
}
@Override
@ -3518,7 +3518,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cCoal Generator";
return "§cCoal Generator";
}
@Override
@ -3580,7 +3580,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§2Bio Reactor";
return "§2Bio Reactor";
}
@Override
@ -3638,8 +3638,8 @@ public class SlimefunSetup {
if (e.getClickedBlock() != null && ChargableBlock.isChargable(e.getClickedBlock())) {
e.setCancelled(true);
p.sendMessage("");
p.sendMessage("§bStored Energy: §3" + DoubleHandler.getFancyDouble(ChargableBlock.getCharge(e.getClickedBlock())) + " J");
p.sendMessage("§bCapacity: §3" + DoubleHandler.getFancyDouble(ChargableBlock.getMaxCharge(e.getClickedBlock())) + " J");
p.sendMessage("§bStored Energy: §3" + DoubleHandler.getFancyDouble(ChargableBlock.getCharge(e.getClickedBlock())) + " J");
p.sendMessage("§bCapacity: §3" + DoubleHandler.getFancyDouble(ChargableBlock.getMaxCharge(e.getClickedBlock())) + " J");
p.sendMessage("");
}
return true;
@ -4299,7 +4299,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§4Lava Generator";
return "§4Lava Generator";
}
@Override
@ -4325,7 +4325,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cCombustion Reactor";
return "§cCombustion Reactor";
}
@Override
@ -4507,7 +4507,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cFood Fabricator";
return "§cFood Fabricator";
}
@Override
@ -4532,7 +4532,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cFood Fabricator";
return "§cFood Fabricator";
}
@Override
@ -4597,7 +4597,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cFood Composter";
return "§cFood Composter";
}
@Override
@ -4622,7 +4622,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cFood Composter";
return "§cFood Composter";
}
@Override
@ -4717,7 +4717,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§bFreezer";
return "§bFreezer";
}
@Override
@ -4742,7 +4742,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§bFreezer";
return "§bFreezer";
}
@Override
@ -4815,11 +4815,11 @@ public class SlimefunSetup {
if (BlockStorage.getBlockInfo(e.getClickedBlock(), "visualizer") == null) {
BlockStorage.addBlockInfo(e.getClickedBlock(), "visualizer", "disabled");
p.sendMessage("§cCargo Net Visualizer: " + "§4\u2718");
p.sendMessage("§cCargo Net Visualizer: " + "§4\u2718");
}
else {
BlockStorage.addBlockInfo(e.getClickedBlock(), "visualizer", null);
p.sendMessage("§cCargo Net Visualizer: " + "§2\u2714");
p.sendMessage("§cCargo Net Visualizer: " + "§2\u2714");
}
return true;
}
@ -4850,10 +4850,10 @@ public class SlimefunSetup {
if (!item.getName().equals("CARGO_NODE")) return false;
if (CargoNet.isConnected(e.getClickedBlock())) {
p.sendMessage("§7Connected: " + "§2\u2714");
p.sendMessage("§7Connected: " + "§2\u2714");
}
else {
p.sendMessage("§7Connected: " + "§4\u2718");
p.sendMessage("§7Connected: " + "§4\u2718");
}
return true;
}
@ -4902,7 +4902,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cCarbon Press";
return "§cCarbon Press";
}
@Override
@ -4927,7 +4927,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cCarbon Press";
return "§cCarbon Press";
}
@Override
@ -4952,7 +4952,7 @@ public class SlimefunSetup {
@Override
public String getInventoryTitle() {
return "§cCarbon Press";
return "§cCarbon Press";
}
@Override