mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Removed even more empty methods

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-08-30 23:11:37 +02:00
parent 43e6b5875c
commit 24ec50e072
19 changed files with 10 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AnimalGrowthAccelerator.java
View File

@ -42,10 +42,6 @@ public class AnimalGrowthAccelerator extends SlimefunItem {
constructMenu(this);
}
@Override
public void newInstance(BlockMenu menu, Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoAnvil.java
View File

@ -37,9 +37,6 @@ public abstract class AutoAnvil extends AContainer {
public ItemStack getProgressBar() {
return new ItemStack(Material.IRON_PICKAXE);
}
@Override
public void registerDefaultRecipes() {}
@Override
public int getSpeed() {

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoBreeder.java
View File

@ -42,10 +42,6 @@ public class AutoBreeder extends SlimefunItem {
constructMenu(this);
}
@Override
public void newInstance(BlockMenu menu, Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);
@ -79,9 +75,7 @@ public class AutoBreeder extends SlimefunItem {
protected void constructMenu(BlockMenuPreset preset) {
for (int i : border) {
preset.addItem(i, new CustomItem(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "),
(p, slot, item, action) -> false
);
preset.addItem(i, new CustomItem(new ItemStack(Material.CYAN_STAINED_GLASS_PANE), " "), (p, slot, item, action) -> false);
}
}

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

@ -46,9 +46,6 @@ public class AutoDisenchanter extends AContainer {
return new ItemStack(Material.DIAMOND_CHESTPLATE);
}
@Override
public void registerDefaultRecipes() {}
@Override
public int getEnergyConsumption() {
return 9;

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoDrier.java
View File

@ -35,9 +35,6 @@ public class AutoDrier extends AContainer {
return new ItemStack(Material.FLINT_AND_STEEL);
}
@Override
public void registerDefaultRecipes() { }
@Override
protected void tick(Block b) {
if (isProcessing(b)) {

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java
View File

@ -47,9 +47,6 @@ public class AutoEnchanter extends AContainer {
return new ItemStack(Material.GOLDEN_CHESTPLATE);
}
@Override
public void registerDefaultRecipes() {}
@Override
public int getEnergyConsumption() {
return 9;

18
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ChargingBench.java
View File

@ -1,5 +1,10 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import me.mrCookieSlime.CSCoreLibPlugin.CSCoreLib;
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
import me.mrCookieSlime.Slimefun.Objects.Category;
@ -7,15 +12,9 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
import me.mrCookieSlime.Slimefun.api.energy.ItemEnergy;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
public class ChargingBench extends AContainer {
public ChargingBench(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) {
@ -28,10 +27,6 @@ public class ChargingBench extends AContainer {
constructMenu(this);
}
@Override
public void newInstance(BlockMenu menu, Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);
@ -60,9 +55,6 @@ public class ChargingBench extends AContainer {
return 10;
}
@Override
public void registerDefaultRecipes() {}
@Override
protected void tick(Block b) {
if (ChargableBlock.getCharge(b) < getEnergyConsumption()) return;

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/CropGrowthAccelerator.java
View File

@ -54,10 +54,6 @@ public abstract class CropGrowthAccelerator extends SlimefunItem {
constructMenu(this);
}
@Override
public void newInstance(BlockMenu menu, Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricDustWasher.java
View File

@ -39,9 +39,6 @@ public abstract class ElectricDustWasher extends AContainer {
public ItemStack getProgressBar() {
return new ItemStack(Material.GOLDEN_SHOVEL);
}
@Override
public void registerDefaultRecipes() {}
public abstract int getSpeed();

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricFurnace.java
View File

@ -30,8 +30,9 @@ public abstract class ElectricFurnace extends AContainer {
}
//Bukkit Recipe Iterator does not seem to include _LOG's of any type for charcoal... Manually adding them all.
for(Material mat:Tag.LOGS.getValues())
for (Material mat:Tag.LOGS.getValues()) {
registerRecipe(4, new ItemStack[] {new ItemStack(mat,1)}, new ItemStack[] {new ItemStack(Material.CHARCOAL, 1)});
}
}
@Override

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricGoldPan.java
View File

@ -37,9 +37,6 @@ public abstract class ElectricGoldPan extends AContainer {
public ItemStack getProgressBar() {
return new ItemStack(Material.DIAMOND_SHOVEL);
}
@Override
public void registerDefaultRecipes() {}
public abstract int getSpeed();

2
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectrifiedCrucible.java
View File

@ -18,9 +18,11 @@ public abstract class ElectrifiedCrucible extends AContainer {
public void registerDefaultRecipes() {
registerRecipe(10, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(Material.COBBLESTONE, 16)}, new ItemStack[]{new ItemStack(Material.LAVA_BUCKET)});
registerRecipe(8, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(Material.TERRACOTTA, 12)}, new ItemStack[]{new ItemStack(Material.LAVA_BUCKET)});
for (Material coloured_terracotta : MaterialHelper.TerracottaColours){
registerRecipe(8, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(coloured_terracotta, 12)}, new ItemStack[]{new ItemStack(Material.LAVA_BUCKET)});
}
registerRecipe(10, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(Material.OAK_LEAVES, 16)}, new ItemStack[]{new ItemStack(Material.WATER_BUCKET)});
registerRecipe(10, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(Material.BIRCH_LEAVES, 16)}, new ItemStack[]{new ItemStack(Material.WATER_BUCKET)});
registerRecipe(10, new ItemStack[] {new ItemStack(Material.BUCKET), new ItemStack(Material.SPRUCE_LEAVES, 16)}, new ItemStack[]{new ItemStack(Material.WATER_BUCKET)});

5
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/FluidPump.java
View File

@ -30,7 +30,6 @@ import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
@ -53,10 +52,6 @@ public class FluidPump extends SlimefunItem{
constructMenu(this);
}
@Override
public void newInstance(BlockMenu menu, Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java
View File

@ -45,10 +45,6 @@ public abstract class HeatedPressureChamber extends AContainer {
constructMenu(this);
}
@Override
public void newInstance(BlockMenu menu, Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/OilPump.java
View File

@ -24,7 +24,6 @@ import me.mrCookieSlime.Slimefun.Setup.Messages;
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
@ -40,10 +39,6 @@ public abstract class OilPump extends AContainer {
constructMenu(this);
}
@Override
public void newInstance(BlockMenu menu, Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
if (!(p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true))) {
@ -80,9 +75,6 @@ public abstract class OilPump extends AContainer {
return new ItemStack(Material.DIAMOND_SHOVEL);
}
@Override
public void registerDefaultRecipes() {}
@Override
protected void tick(Block b) {
if (isProcessing(b)) {

5
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ReactorAccessPort.java
View File

@ -42,11 +42,6 @@ public class ReactorAccessPort extends SlimefunItem {
constructMenu(this);
}
@Override
public void newInstance(BlockMenu menu, Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
if(p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(),b,true)) {

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java
View File

@ -36,9 +36,6 @@ public abstract class Refinery extends AContainer {
public ItemStack getProgressBar() {
return new ItemStack(Material.FLINT_AND_STEEL);
}
@Override
public void registerDefaultRecipes() {}
@Override
public String getMachineIdentifier() {

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/TrashCan.java
View File

@ -30,10 +30,6 @@ public class TrashCan extends SlimefunItem {
constructMenu(this);
}
@Override
public void newInstance(final BlockMenu menu, final Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
return true;

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/XPCollector.java
View File

@ -41,10 +41,6 @@ public class XPCollector extends SlimefunItem {
constructMenu(this);
}
@Override
public void newInstance(BlockMenu menu, Block b) {
}
@Override
public boolean canOpen(Block b, Player p) {
return p.hasPermission("slimefun.inventory.bypass") || CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true);