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

fixed broken items credits to walshy

This commit is contained in:
J3fftw1 2019-10-16 00:17:24 +02:00
parent 20e3f2b9ce
commit 5547b57da9
30 changed files with 122 additions and 31 deletions

View File

@ -42,7 +42,10 @@ 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

@ -17,7 +17,10 @@ public class DietCookie extends SimpleSlimefunItem<ItemConsumptionHandler> {
public DietCookie(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public DietCookie(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 ItemConsumptionHandler getItemHandler() { public ItemConsumptionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -16,7 +16,10 @@ 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

@ -33,7 +33,10 @@ public class ExplosivePickaxe extends SimpleSlimefunItem<BlockBreakHandler> impl
public ExplosivePickaxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { public ExplosivePickaxe(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 BlockBreakHandler getItemHandler() { public BlockBreakHandler getItemHandler() {
return (e, item, fortune, drops) -> { return (e, item, fortune, drops) -> {

View File

@ -25,7 +25,10 @@ public class ExplosiveShovel extends SimpleSlimefunItem<BlockBreakHandler> imple
public ExplosiveShovel(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { public ExplosiveShovel(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 BlockBreakHandler getItemHandler() { public BlockBreakHandler getItemHandler() {
return (e, item, fortune, drops) -> { return (e, item, fortune, drops) -> {

View File

@ -46,7 +46,10 @@ 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,7 +30,10 @@ 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

@ -17,7 +17,10 @@ public class HerculesPickaxe extends SimpleSlimefunItem<BlockBreakHandler> {
public HerculesPickaxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public HerculesPickaxe(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

@ -22,7 +22,10 @@ public class HunterTalisman extends Talisman {
public void preRegister() { public void preRegister() {
addItemHandler(getItemHandler()); addItemHandler(getItemHandler());
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
public EntityKillHandler getItemHandler() { public EntityKillHandler getItemHandler() {
return (e, entity, killer, item) -> { return (e, entity, killer, item) -> {
if (Talisman.checkFor(e, this) && !(e.getEntity() instanceof Player)) { if (Talisman.checkFor(e, this) && !(e.getEntity() instanceof Player)) {

View File

@ -18,7 +18,10 @@ 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,7 +17,10 @@ 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,7 +25,10 @@ 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,7 +18,10 @@ 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) {

View File

@ -17,7 +17,10 @@ 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,7 +21,10 @@ 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

@ -17,7 +17,10 @@ public class MonsterJerky extends SimpleSlimefunItem<ItemConsumptionHandler> {
public MonsterJerky(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public MonsterJerky(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 ItemConsumptionHandler getItemHandler() { public ItemConsumptionHandler getItemHandler() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -23,7 +23,10 @@ public class PickaxeOfContainment extends SimpleSlimefunItem<BlockBreakHandler>
public PickaxeOfContainment(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public PickaxeOfContainment(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

@ -18,7 +18,10 @@ 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

@ -23,7 +23,10 @@ public class PickaxeOfVeinMining extends SimpleSlimefunItem<BlockBreakHandler> {
public PickaxeOfVeinMining(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public PickaxeOfVeinMining(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

@ -16,7 +16,10 @@ public class PortableCrafter extends SimpleSlimefunItem<ItemInteractionHandler>
public PortableCrafter(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public PortableCrafter(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,7 +18,11 @@ 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() {
return (e, p, item) -> { return (e, p, item) -> {

View File

@ -14,7 +14,10 @@ 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,7 +30,10 @@ 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

@ -21,7 +21,10 @@ public class SmeltersPickaxe extends SimpleSlimefunItem<BlockBreakHandler> {
public SmeltersPickaxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public SmeltersPickaxe(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

@ -27,7 +27,10 @@ public class SoulboundRune extends SimpleSlimefunItem<ItemDropHandler> {
public SoulboundRune(Category category, ItemStack item, String id, RecipeType type, ItemStack[] recipe) { public SoulboundRune(Category category, ItemStack item, String id, RecipeType type, ItemStack[] recipe) {
super(category, item, id, type, recipe); super(category, item, id, type, recipe);
} }
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public ItemDropHandler getItemHandler() { public ItemDropHandler getItemHandler() {
return (e, p, i) -> { return (e, p, i) -> {

View File

@ -45,7 +45,10 @@ 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

@ -33,7 +33,10 @@ public class SwordOfBeheading extends SimpleSlimefunItem<EntityKillHandler> {
public SwordOfBeheading(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { public SwordOfBeheading(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 EntityKillHandler getItemHandler() { public EntityKillHandler getItemHandler() {
return (e, entity, killer, item) -> { return (e, entity, killer, item) -> {

View File

@ -17,7 +17,10 @@ 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

@ -21,7 +21,10 @@ public class WindStaff extends SimpleSlimefunItem<ItemInteractionHandler> {
public WindStaff(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { public WindStaff(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

@ -41,11 +41,14 @@ public abstract class GPSTransmitter extends SimpleSlimefunItem<BlockTicker> {
public abstract double getMultiplier(int y); public abstract double getMultiplier(int y);
public abstract int getEnergyConsumption(); public abstract int getEnergyConsumption();
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override @Override
public BlockTicker getItemHandler() { public BlockTicker getItemHandler() {
return new BlockTicker() { return new BlockTicker() {
@Override @Override
public void tick(Block b, SlimefunItem item, Config data) { public void tick(Block b, SlimefunItem item, Config data) {
int charge = ChargableBlock.getCharge(b); int charge = ChargableBlock.getCharge(b);