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

Merge pull request #1189 from J3fftw1/fix/fixed-broken-items

fixed broken items credits to walshy
This commit is contained in:
TheBusyBiscuit 2019-10-16 18:38:54 +02:00 committed by GitHub
commit 4a44783bf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 56 additions and 20 deletions

View File

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

View File

@ -16,7 +16,7 @@ public class EnderBackpack extends SimpleSlimefunItem<ItemInteractionHandler> {
public EnderBackpack(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe);
}
@Override
public ItemInteractionHandler getItemHandler() {
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) {
super(category, item, recipeType, recipe, keys, values);
}
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override
public BlockBreakHandler getItemHandler() {
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) {
super(category, item, recipeType, recipe, keys, values);
}
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override
public BlockBreakHandler getItemHandler() {
return (e, item, fortune, drops) -> {

View File

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

View File

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

View File

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

View File

@ -24,7 +24,10 @@ public class LumberAxe extends SimpleSlimefunItem<BlockBreakHandler> implements
public LumberAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe);
}
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override
public BlockBreakHandler getItemHandler() {
return (e, item, fortune, drops) -> {

View File

@ -17,7 +17,10 @@ public class MonsterJerky extends SimpleSlimefunItem<ItemConsumptionHandler> {
public MonsterJerky(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe);
}
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override
public ItemConsumptionHandler getItemHandler() {
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) {
super(category, item, recipeType, recipe);
}
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override
public BlockBreakHandler getItemHandler() {
return (e, item, fortune, drops) -> {

View File

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

View File

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

View File

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

View File

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

View File

@ -45,7 +45,7 @@ public class StormStaff extends SimpleSlimefunItem<ItemInteractionHandler> {
item.setItemMeta(im);
return item;
}
@Override
public ItemInteractionHandler getItemHandler() {
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) {
super(category, item, recipeType, recipe, keys, values);
}
@Override
protected boolean areItemHandlersPrivate() {
return false;
}
@Override
public EntityKillHandler getItemHandler() {
return (e, entity, killer, item) -> {

View File

@ -21,7 +21,7 @@ public class WindStaff extends SimpleSlimefunItem<ItemInteractionHandler> {
public WindStaff(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
super(category, item, recipeType, recipe);
}
@Override
public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> {

View File

@ -45,7 +45,7 @@ public abstract class GPSTransmitter extends SimpleSlimefunItem<BlockTicker> {
@Override
public BlockTicker getItemHandler() {
return new BlockTicker() {
@Override
public void tick(Block b, SlimefunItem item, Config data) {
int charge = ChargableBlock.getCharge(b);