mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Merge branch 'fix/fixed-broken-items' of https://github.com/J3fftw1/Slimefun4 into fix/fixed-broken-items
# Conflicts: # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/EnderBackpack.java # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GoldPan.java # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GrapplingHook.java # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/InfernalBonemeal.java # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeTome.java # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableCrafter.java # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/WindStaff.java
This commit is contained in:
commit
73130bc21b
@ -16,7 +16,10 @@ public class EnderBackpack extends SimpleSlimefunItem<ItemInteractionHandler> {
|
||||
public EnderBackpack(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||
super(category, item, recipeType, recipe);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
|
||||
@Override
|
||||
public ItemInteractionHandler getItemHandler() {
|
||||
return (e, p, item) -> {
|
||||
|
@ -46,7 +46,10 @@ public class GoldPan extends SimpleSlimefunItem<ItemInteractionHandler> implemen
|
||||
chanceClay = (int) Slimefun.getItemValue(getID(), "chance.CLAY");
|
||||
chanceFlint = (int) Slimefun.getItemValue(getID(), "chance.FLINT");
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
|
||||
@Override
|
||||
public ItemInteractionHandler getItemHandler() {
|
||||
return (e, p, item) -> {
|
||||
|
@ -30,7 +30,10 @@ public class GrapplingHook extends SimpleSlimefunItem<ItemInteractionHandler> {
|
||||
public GrapplingHook(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) {
|
||||
super(category, item, recipeType, recipe, keys, values);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
|
||||
@Override
|
||||
public ItemInteractionHandler getItemHandler() {
|
||||
Utilities utilities = SlimefunPlugin.getUtilities();
|
||||
|
@ -18,7 +18,10 @@ public class InfernalBonemeal extends SimpleSlimefunItem<ItemInteractionHandler>
|
||||
public InfernalBonemeal(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) {
|
||||
super(category, item, id, recipeType, recipe, recipeOutput);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
|
||||
@Override
|
||||
public ItemInteractionHandler getItemHandler() {
|
||||
return (e, p, item) -> {
|
||||
|
@ -25,7 +25,10 @@ public class KnowledgeTome extends SimpleSlimefunItem<ItemInteractionHandler> {
|
||||
public KnowledgeTome(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||
super(category, item, recipeType, recipe);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
|
||||
@Override
|
||||
public ItemInteractionHandler getItemHandler() {
|
||||
return (e, p, item) -> {
|
||||
|
@ -19,6 +19,14 @@ import me.mrCookieSlime.Slimefun.Objects.handlers.BlockBreakHandler;
|
||||
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
||||
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
@Override
|
||||
protected boolean areItemHandlersPrivate() {
|
||||
return false;
|
||||
}
|
||||
|
||||
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
|
||||
public class LumberAxe extends SimpleSlimefunItem<BlockBreakHandler> implements NotPlaceable {
|
||||
|
||||
public LumberAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||
|
@ -16,6 +16,10 @@ public class PortableCrafter extends SimpleSlimefunItem<ItemInteractionHandler>
|
||||
public PortableCrafter(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||
super(category, item, recipeType, recipe);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
|
||||
@Override
|
||||
public ItemInteractionHandler getItemHandler() {
|
||||
return (e, p, item) -> {
|
||||
|
@ -21,6 +21,10 @@ public class WindStaff extends SimpleSlimefunItem<ItemInteractionHandler> {
|
||||
public WindStaff(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||
super(category, item, recipeType, recipe);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
|
||||
@Override
|
||||
public ItemInteractionHandler getItemHandler() {
|
||||
return (e, p, item) -> {
|
||||
|
Loading…
Reference in New Issue
Block a user