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

Merge branch 'fix/fixed-broken-items' of https://github.com/J3fftw1/Slimefun4 into fix/fixed-broken-items

Browse Source 
# 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:
J3fftw1 2019-10-16 17:15:22 +02:00
commit 73130bc21b
8 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/EnderBackpack.java
View File

@ -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) -> {

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GoldPan.java
View File

@ -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) -> {

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GrapplingHook.java
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) {
super(category, item, recipeType, recipe, keys, values);
}
<<<<<<< HEAD
=======
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
@Override
public ItemInteractionHandler getItemHandler() {
Utilities utilities = SlimefunPlugin.getUtilities();

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/InfernalBonemeal.java
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) {
super(category, item, id, recipeType, recipe, recipeOutput);
}
<<<<<<< HEAD
=======
>>>>>>> 90f3141aecfc6ed000810afedc0ac791aa8b6ace
@Override
public ItemInteractionHandler getItemHandler() {
return (e, p, item) -> {

3
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeTome.java
View File

@ -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) -> {

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java
View File

@ -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) {

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableCrafter.java
View File

@ -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) -> {

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/WindStaff.java
View File

@ -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) -> {