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 Stone Chunk -> Cobblestone Recipe not working

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-10-01 18:47:40 +02:00
parent 431892abb2
commit db0b6dfa90
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,26 +15,26 @@ import me.mrCookieSlime.Slimefun.Objects.MultiBlock;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.RecipeDisplayItem;
public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
protected List<ItemStack[]> recipes;
protected List<ItemStack> shownRecipes;
protected List<ItemStack> shownRecipes;
private BlockFace trigger;
@Deprecated
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger) {
this(category, item, id, recipe, machineRecipes, convertTriggerMaterial(recipe, trigger));
}
@Deprecated
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, boolean ghost) {
this(category, item, id, recipe, machineRecipes, convertTriggerMaterial(recipe, trigger), ghost);
}
@Deprecated
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, String[] keys, Object[] values) {
this(category, item, id, recipe, machineRecipes, convertTriggerMaterial(recipe, trigger), keys, values);
}
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, BlockFace trigger) {
super(category, item, id, RecipeType.MULTIBLOCK, recipe);
this.recipes = new ArrayList<>();
@ -42,7 +42,7 @@ public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
this.shownRecipes.addAll(Arrays.asList(machineRecipes));
this.trigger = trigger;
}
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, BlockFace trigger, boolean ghost) {
super(category, item, id, RecipeType.MULTIBLOCK, recipe, ghost);
this.recipes = new ArrayList<>();
@ -50,7 +50,7 @@ public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
this.shownRecipes.addAll(Arrays.asList(machineRecipes));
this.trigger = trigger;
}
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, BlockFace trigger, String[] keys, Object[] values) {
super(category, item, id, RecipeType.MULTIBLOCK, recipe, keys, values);
this.recipes = new ArrayList<>();
@ -58,26 +58,26 @@ public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
this.shownRecipes.addAll(Arrays.asList(machineRecipes));
this.trigger = trigger;
}
public List<ItemStack[]> getRecipes() {
return recipes;
}
@Override
public List<ItemStack> getDisplayRecipes() {
return shownRecipes;
}
public void addRecipe(ItemStack[] input, ItemStack output) {
recipes.add(input);
recipes.add(new ItemStack[] {output});
}
@Override
public void postRegister() {
this.toMultiBlock().register();
}
@Override
public void install() {
for (ItemStack i: shownRecipes) {
@ -95,18 +95,18 @@ public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
else if (i.getType() == Material.FLINT_AND_STEEL) mats.add(Material.FIRE);
else mats.add(i.getType());
}
return mats.toArray(new Material[mats.size()]);
}
public MultiBlock toMultiBlock() {
return new MultiBlock(convertItemStacksToMaterial(this.getRecipe()), this.trigger);
}
public Iterator<ItemStack[]> recipeIterator() {
return this.recipes.iterator();
}
@Deprecated
private static BlockFace convertTriggerMaterial(ItemStack[] recipe, Material trigger) {
return MultiBlock.convertTriggerMaterialToBlockFace(convertItemStacksToMaterial(recipe), trigger);

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

@ -28,13 +28,7 @@ public class Compressor extends MultiBlockMachine {
SlimefunItems.COMPRESSOR,
"COMPRESSOR",
new ItemStack[] {null, null, null, null, new ItemStack(Material.NETHER_BRICK_FENCE), null, new ItemStack(Material.PISTON), new CustomItem(Material.DISPENSER, "Dispenser (Facing up)"), new ItemStack(Material.PISTON)},
new ItemStack[] {
new ItemStack(Material.COAL, 8), SlimefunItems.CARBON,
new CustomItem(SlimefunItems.STEEL_INGOT, 8), SlimefunItems.STEEL_PLATE,
new CustomItem(SlimefunItems.CARBON, 4), SlimefunItems.COMPRESSED_CARBON,
new CustomItem(SlimefunItems.STONE_CHUNK, 4), new ItemStack(Material.COBBLESTONE),
new CustomItem(SlimefunItems.REINFORCED_ALLOY_INGOT, 8), SlimefunItems.REINFORCED_PLATE
},
new ItemStack[] {new CustomItem(SlimefunItems.STONE_CHUNK, 4), new ItemStack(Material.COBBLESTONE)},
BlockFace.SELF
);
}
@ -44,11 +38,6 @@ public class Compressor extends MultiBlockMachine {
return recipes.stream().map(items -> items[0]).collect(Collectors.toList());
}
@Override
public void install() {
// Do nothing to prevent double-registration of recipes
}
@Override
public void onInteract(Player p, Block b) {
Block dispBlock = b.getRelative(BlockFace.DOWN);