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

Fixed Basic Machines not showing all recipes

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-09-26 20:09:03 +02:00
parent 3a4a1ac96e
commit fd76555ea1
7 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.RecipeDisplayIt
public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
private List<ItemStack[]> recipes;
protected List<ItemStack[]> recipes;
private Material trigger;
protected List<ItemStack> shownRecipes;
@ -65,7 +65,7 @@ public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
@Override
public void install() {
for (ItemStack i: this.getDisplayRecipes()) {
for (ItemStack i: shownRecipes) {
SlimefunItem item = SlimefunItem.getByItem(i);
if (item == null || !SlimefunItem.isDisabled(i)) {
this.recipes.add(new ItemStack[] {i});

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Compressor.java
View File

@ -1,5 +1,8 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.Sound;
@ -36,6 +39,11 @@ public class Compressor extends MultiBlockMachine {
);
}
@Override
public List<ItemStack> getDisplayRecipes() {
return recipes.stream().map(items -> items[0]).collect(Collectors.toList());
}
@Override
public void onInteract(Player p, Block b) {
Block dispBlock = b.getRelative(BlockFace.DOWN);

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/GrindStone.java
View File

@ -1,5 +1,8 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
@ -40,6 +43,11 @@ public class GrindStone extends MultiBlockMachine {
);
}
@Override
public List<ItemStack> getDisplayRecipes() {
return recipes.stream().map(items -> items[0]).collect(Collectors.toList());
}
@Override
public void onInteract(Player p, Block b) {
Block dispBlock = b.getRelative(BlockFace.DOWN);

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/Juicer.java
View File

@ -1,5 +1,8 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.Effect;
import org.bukkit.Material;
import org.bukkit.Sound;
@ -36,6 +39,11 @@ public class Juicer extends MultiBlockMachine {
);
}
@Override
public List<ItemStack> getDisplayRecipes() {
return recipes.stream().map(items -> items[0]).collect(Collectors.toList());
}
@Override
public void onInteract(Player p, Block b) {
Block dispBlock = b.getRelative(BlockFace.DOWN);

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreCrusher.java
View File

@ -1,5 +1,8 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.Effect;
import org.bukkit.Material;
import org.bukkit.block.Block;
@ -40,6 +43,11 @@ public class OreCrusher extends MultiBlockMachine {
);
}
@Override
public List<ItemStack> getDisplayRecipes() {
return recipes.stream().map(items -> items[0]).collect(Collectors.toList());
}
@Override
public void onInteract(Player p, Block b) {
Block dispBlock = b.getRelative(BlockFace.DOWN);

8
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/PressureChamber.java
View File

@ -1,5 +1,8 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.multiblocks;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.Material;
@ -34,6 +37,11 @@ public class PressureChamber extends MultiBlockMachine {
);
}
@Override
public List<ItemStack> getDisplayRecipes() {
return recipes.stream().map(items -> items[0]).collect(Collectors.toList());
}
@Override
public void onInteract(Player p, Block b) {
Block dispBlock = b.getRelative(BlockFace.UP).getRelative(BlockFace.UP);

14
src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
View File

@ -242,7 +242,7 @@ public final class SlimefunSetup {
new Compressor().register();
new SlimefunItem(Categories.LUMPS_AND_MAGIC, SlimefunItems.MAGIC_LUMP_1, "MAGIC_LUMP_1", RecipeType.GRIND_STONE,
new ItemStack[] {null, null, null, null, new ItemStack(Material.NETHER_WART), null, null, null, null}, new CustomItem(SlimefunItems.MAGIC_LUMP_1, 2))
new ItemStack[] {new ItemStack(Material.NETHER_WART), null, null, null, null, null, null, null, null}, new CustomItem(SlimefunItems.MAGIC_LUMP_1, 2))
.register(true);
new SlimefunItem(Categories.LUMPS_AND_MAGIC, SlimefunItems.MAGIC_LUMP_2, "MAGIC_LUMP_2", RecipeType.ENHANCED_CRAFTING_TABLE,
@ -538,7 +538,7 @@ public final class SlimefunSetup {
.register(true);
new SlimefunItem(Categories.MISC, SlimefunItems.WHEAT_FLOUR, "WHEAT_FLOUR", RecipeType.GRIND_STONE,
new ItemStack[] {null, null, null, null, new ItemStack(Material.WHEAT), null, null, null, null})
new ItemStack[] {new ItemStack(Material.WHEAT), null, null, null, null, null, null, null, null})
.register(true);
new SlimefunItem(Categories.MISC, SlimefunItems.STEEL_PLATE, "STEEL_PLATE", RecipeType.COMPRESSOR,
@ -1446,23 +1446,23 @@ public final class SlimefunSetup {
new Juicer().register();
new Juice(Categories.FOOD, SlimefunItems.APPLE_JUICE, "APPLE_JUICE", RecipeType.JUICER,
new ItemStack[] {null, null, null, null, new ItemStack(Material.APPLE), null, null, null, null})
new ItemStack[] {new ItemStack(Material.APPLE), null, null, null, null, null, null, null, null})
.register(true);
new Juice(Categories.FOOD, SlimefunItems.CARROT_JUICE, "CARROT_JUICE", RecipeType.JUICER,
new ItemStack[] {null, null, null, null, new ItemStack(Material.CARROT), null, null, null, null})
new ItemStack[] {new ItemStack(Material.CARROT), null, null, null, null, null, null, null, null})
.register(true);
new Juice(Categories.FOOD, SlimefunItems.MELON_JUICE, "MELON_JUICE", RecipeType.JUICER,
new ItemStack[] {null, null, null, null, new ItemStack(Material.MELON), null, null, null, null})
new ItemStack[] {new ItemStack(Material.MELON), null, null, null, null, null, null, null, null})
.register(true);
new Juice(Categories.FOOD, SlimefunItems.PUMPKIN_JUICE, "PUMPKIN_JUICE", RecipeType.JUICER,
new ItemStack[] {null, null, null, null, new ItemStack(Material.PUMPKIN), null, null, null, null})
new ItemStack[] {new ItemStack(Material.PUMPKIN), null, null, null, null, null, null, null, null})
.register(true);
new Juice(Categories.FOOD, SlimefunItems.GOLDEN_APPLE_JUICE, "GOLDEN_APPLE_JUICE", RecipeType.JUICER,
new ItemStack[] {null, null, null, null, new ItemStack(Material.GOLDEN_APPLE), null, null, null, null})
new ItemStack[] {new ItemStack(Material.GOLDEN_APPLE), null, null, null, null, null, null, null, null})
.register(true);
new SlimefunItem(Categories.LUMPS_AND_MAGIC, SlimefunItems.BROKEN_SPAWNER, "BROKEN_SPAWNER", new RecipeType(SlimefunItems.PICKAXE_OF_CONTAINMENT),