diff --git a/src/me/mrCookieSlime/Slimefun/GEO/OreGenResource.java b/src/me/mrCookieSlime/Slimefun/GEO/OreGenResource.java index ce80fe49b..2270e67ed 100644 --- a/src/me/mrCookieSlime/Slimefun/GEO/OreGenResource.java +++ b/src/me/mrCookieSlime/Slimefun/GEO/OreGenResource.java @@ -15,11 +15,13 @@ public interface OreGenResource { */ String getName(); - /** - * For the GEO-Scanner - */ + @Deprecated ItemStack getIcon(); + default ItemStack getItem() { + return getIcon(); + } + /** * Measurement Unit e.g. "Buckets" */ diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java index dc7e05fad..c5645cfcf 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/geo/GEOMiner.java @@ -45,7 +45,7 @@ public abstract class GEOMiner extends AContainer implements InventoryBlock, Rec @Override public void onPlace(Player p, Block b, SlimefunItem item) { // Spawn the hologram - SimpleHologram.update(b, "&7Waiting..."); + SimpleHologram.update(b, "&7Idling..."); } @Override @@ -110,7 +110,7 @@ public abstract class GEOMiner extends AContainer implements InventoryBlock, Rec List displayRecipes = new LinkedList<>(); for (OreGenResource resource: OreGenSystem.listResources()) { if (!resource.isLiquid()) { - displayRecipes.add(new CustomItem(resource.getIcon(), "&r" + resource.getName())); + displayRecipes.add(new CustomItem(resource.getItem(), "&r" + resource.getName())); } } @@ -176,26 +176,26 @@ public abstract class GEOMiner extends AContainer implements InventoryBlock, Rec if (!resource.isLiquid()) { if (!OreGenSystem.wasResourceGenerated(resource, chunk)) { SimpleHologram.update(b, "&4GEO-Scan required!"); - break; + return; } else { int supplies = OreGenSystem.getSupplies(resource, chunk, false); if (supplies > 0) { - MachineRecipe r = new MachineRecipe(getProcessingTime() / getSpeed(), new ItemStack[0], new ItemStack[] {resource.getIcon().clone()}); + MachineRecipe r = new MachineRecipe(getProcessingTime() / getSpeed(), new ItemStack[0], new ItemStack[] {resource.getItem().clone()}); if (!fits(b, r.getOutput())) return; processing.put(b, r); progress.put(b, r.getTicks()); OreGenSystem.setSupplies(resource, b.getChunk(), supplies - 1); SimpleHologram.update(b, "&7Mining: &r" + resource.getName()); - break; + return; } } } } - SimpleHologram.update(b, "&7Idling"); + SimpleHologram.update(b, "&7Finished"); } }