1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00

fixed requested changes

and re added EnhancedFurnace
Becuase of some reason Retard Panda removed it
This commit is contained in:
J3fftw1 2019-10-16 17:14:51 +02:00
parent 5547b57da9
commit 4b21732ee9
18 changed files with 19 additions and 73 deletions

View File

@ -42,10 +42,7 @@ public class EnhancedFurnace extends SimpleSlimefunItem<BlockTicker> {
fortune++; fortune++;
return fortune; return fortune;
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public BlockTicker getItemHandler() { public BlockTicker getItemHandler() {
return new BlockTicker() { return new BlockTicker() {

View File

@ -16,10 +16,7 @@ public class EnderBackpack extends SimpleSlimefunItem<ItemInteractionHandler> {
public EnderBackpack(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public EnderBackpack(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -46,10 +46,7 @@ public class GoldPan extends SimpleSlimefunItem<ItemInteractionHandler> implemen
chanceClay = (int) Slimefun.getItemValue(getID(), "chance.CLAY"); chanceClay = (int) Slimefun.getItemValue(getID(), "chance.CLAY");
chanceFlint = (int) Slimefun.getItemValue(getID(), "chance.FLINT"); chanceFlint = (int) Slimefun.getItemValue(getID(), "chance.FLINT");
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -30,10 +30,7 @@ public class GrapplingHook extends SimpleSlimefunItem<ItemInteractionHandler> {
public GrapplingHook(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { public GrapplingHook(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) {
super(category, item, recipeType, recipe, keys, values); super(category, item, recipeType, recipe, keys, values);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
Utilities utilities = SlimefunPlugin.getUtilities(); Utilities utilities = SlimefunPlugin.getUtilities();

View File

@ -18,10 +18,7 @@ public class InfernalBonemeal extends SimpleSlimefunItem<ItemInteractionHandler>
public InfernalBonemeal(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { public InfernalBonemeal(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) {
super(category, item, id, recipeType, recipe, recipeOutput); super(category, item, id, recipeType, recipe, recipeOutput);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -17,10 +17,7 @@ public class KnowledgeFlask extends SimpleSlimefunItem<ItemInteractionHandler> {
public KnowledgeFlask(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { public KnowledgeFlask(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) {
super(category, item, recipeType, recipe, recipeOutput); super(category, item, recipeType, recipe, recipeOutput);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -25,10 +25,7 @@ public class KnowledgeTome extends SimpleSlimefunItem<ItemInteractionHandler> {
public KnowledgeTome(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public KnowledgeTome(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -18,16 +18,16 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.NotPlaceable;
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockBreakHandler; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockBreakHandler;
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
public class LumberAxe extends SimpleSlimefunItem<BlockBreakHandler> implements NotPlaceable { public class LumberAxe extends SimpleSlimefunItem<BlockBreakHandler> implements NotPlaceable {
public LumberAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public LumberAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public BlockBreakHandler getItemHandler() { public BlockBreakHandler getItemHandler() {
return (e, item, fortune, drops) -> { return (e, item, fortune, drops) -> {

View File

@ -17,10 +17,7 @@ public class MagicEyeOfEnder extends SimpleSlimefunItem<ItemInteractionHandler>
public MagicEyeOfEnder(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public MagicEyeOfEnder(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -21,10 +21,7 @@ public class MagicSugar extends SimpleSlimefunItem<ItemInteractionHandler> {
public MagicSugar(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { public MagicSugar(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) {
super(category, item, recipeType, recipe, keys, values); super(category, item, recipeType, recipe, keys, values);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -18,10 +18,7 @@ public class PickaxeOfTheSeeker extends SimpleSlimefunItem<ItemInteractionHandle
public PickaxeOfTheSeeker(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public PickaxeOfTheSeeker(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -17,10 +17,6 @@ public class PortableCrafter extends SimpleSlimefunItem<ItemInteractionHandler>
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override @Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {
if (SlimefunManager.isItemSimiliar(item, SlimefunItems.PORTABLE_CRAFTER, true)) { if (SlimefunManager.isItemSimiliar(item, SlimefunItems.PORTABLE_CRAFTER, true)) {

View File

@ -18,10 +18,6 @@ public class PortableDustbin extends SimpleSlimefunItem<ItemInteractionHandler>
public PortableDustbin(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public PortableDustbin(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {

View File

@ -14,10 +14,7 @@ public class PortableGEOScanner extends SimpleSlimefunItem<ItemInteractionHandle
public PortableGEOScanner(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) { public PortableGEOScanner(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, id, recipeType, recipe); super(category, item, id, recipeType, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -30,10 +30,7 @@ public class SeismicAxe extends SimpleSlimefunItem<ItemInteractionHandler> imple
public SeismicAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public SeismicAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -45,10 +45,7 @@ public class StormStaff extends SimpleSlimefunItem<ItemInteractionHandler> {
item.setItemMeta(im); item.setItemMeta(im);
return item; return item;
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -17,10 +17,7 @@ public class TelepositionScroll extends SimpleSlimefunItem<ItemInteractionHandle
public TelepositionScroll(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public TelepositionScroll(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -22,10 +22,6 @@ public class WindStaff extends SimpleSlimefunItem<ItemInteractionHandler> {
super(category, item, recipeType, recipe); super(category, item, recipeType, recipe);
} }
@Override @Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override
public ItemInteractionHandler getItemHandler() { public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {
if (SlimefunManager.isItemSimiliar(item, getItem(), true)) { if (SlimefunManager.isItemSimiliar(item, getItem(), true)) {