mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 11:45:51 +00:00
Updated GEO-Miner
This commit is contained in:
parent
016b1c84eb
commit
3ed959ed1c
@ -15,11 +15,13 @@ public interface OreGenResource {
|
|||||||
*/
|
*/
|
||||||
String getName();
|
String getName();
|
||||||
|
|
||||||
/**
|
@Deprecated
|
||||||
* For the GEO-Scanner
|
|
||||||
*/
|
|
||||||
ItemStack getIcon();
|
ItemStack getIcon();
|
||||||
|
|
||||||
|
default ItemStack getItem() {
|
||||||
|
return getIcon();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Measurement Unit e.g. "Buckets"
|
* Measurement Unit e.g. "Buckets"
|
||||||
*/
|
*/
|
||||||
|
@ -45,7 +45,7 @@ public abstract class GEOMiner extends AContainer implements InventoryBlock, Rec
|
|||||||
@Override
|
@Override
|
||||||
public void onPlace(Player p, Block b, SlimefunItem item) {
|
public void onPlace(Player p, Block b, SlimefunItem item) {
|
||||||
// Spawn the hologram
|
// Spawn the hologram
|
||||||
SimpleHologram.update(b, "&7Waiting...");
|
SimpleHologram.update(b, "&7Idling...");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -110,7 +110,7 @@ public abstract class GEOMiner extends AContainer implements InventoryBlock, Rec
|
|||||||
List<ItemStack> displayRecipes = new LinkedList<>();
|
List<ItemStack> displayRecipes = new LinkedList<>();
|
||||||
for (OreGenResource resource: OreGenSystem.listResources()) {
|
for (OreGenResource resource: OreGenSystem.listResources()) {
|
||||||
if (!resource.isLiquid()) {
|
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 (!resource.isLiquid()) {
|
||||||
if (!OreGenSystem.wasResourceGenerated(resource, chunk)) {
|
if (!OreGenSystem.wasResourceGenerated(resource, chunk)) {
|
||||||
SimpleHologram.update(b, "&4GEO-Scan required!");
|
SimpleHologram.update(b, "&4GEO-Scan required!");
|
||||||
break;
|
return;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int supplies = OreGenSystem.getSupplies(resource, chunk, false);
|
int supplies = OreGenSystem.getSupplies(resource, chunk, false);
|
||||||
if (supplies > 0) {
|
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;
|
if (!fits(b, r.getOutput())) return;
|
||||||
|
|
||||||
processing.put(b, r);
|
processing.put(b, r);
|
||||||
progress.put(b, r.getTicks());
|
progress.put(b, r.getTicks());
|
||||||
OreGenSystem.setSupplies(resource, b.getChunk(), supplies - 1);
|
OreGenSystem.setSupplies(resource, b.getChunk(), supplies - 1);
|
||||||
SimpleHologram.update(b, "&7Mining: &r" + resource.getName());
|
SimpleHologram.update(b, "&7Mining: &r" + resource.getName());
|
||||||
break;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SimpleHologram.update(b, "&7Idling");
|
SimpleHologram.update(b, "&7Finished");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user