mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 11:45:51 +00:00
Fixed Stone Chunk -> Cobblestone Recipe not working
This commit is contained in:
parent
431892abb2
commit
db0b6dfa90
@ -15,26 +15,26 @@ import me.mrCookieSlime.Slimefun.Objects.MultiBlock;
|
|||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.RecipeDisplayItem;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.RecipeDisplayItem;
|
||||||
|
|
||||||
public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
|
public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
|
||||||
|
|
||||||
protected List<ItemStack[]> recipes;
|
protected List<ItemStack[]> recipes;
|
||||||
protected List<ItemStack> shownRecipes;
|
protected List<ItemStack> shownRecipes;
|
||||||
private BlockFace trigger;
|
private BlockFace trigger;
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger) {
|
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger) {
|
||||||
this(category, item, id, recipe, machineRecipes, convertTriggerMaterial(recipe, trigger));
|
this(category, item, id, recipe, machineRecipes, convertTriggerMaterial(recipe, trigger));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, boolean ghost) {
|
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);
|
this(category, item, id, recipe, machineRecipes, convertTriggerMaterial(recipe, trigger), ghost);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, Material trigger, String[] keys, Object[] values) {
|
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);
|
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) {
|
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, BlockFace trigger) {
|
||||||
super(category, item, id, RecipeType.MULTIBLOCK, recipe);
|
super(category, item, id, RecipeType.MULTIBLOCK, recipe);
|
||||||
this.recipes = new ArrayList<>();
|
this.recipes = new ArrayList<>();
|
||||||
@ -42,7 +42,7 @@ public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
|
|||||||
this.shownRecipes.addAll(Arrays.asList(machineRecipes));
|
this.shownRecipes.addAll(Arrays.asList(machineRecipes));
|
||||||
this.trigger = trigger;
|
this.trigger = trigger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, BlockFace trigger, boolean ghost) {
|
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, BlockFace trigger, boolean ghost) {
|
||||||
super(category, item, id, RecipeType.MULTIBLOCK, recipe, ghost);
|
super(category, item, id, RecipeType.MULTIBLOCK, recipe, ghost);
|
||||||
this.recipes = new ArrayList<>();
|
this.recipes = new ArrayList<>();
|
||||||
@ -50,7 +50,7 @@ public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
|
|||||||
this.shownRecipes.addAll(Arrays.asList(machineRecipes));
|
this.shownRecipes.addAll(Arrays.asList(machineRecipes));
|
||||||
this.trigger = trigger;
|
this.trigger = trigger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SlimefunMachine(Category category, ItemStack item, String id, ItemStack[] recipe, ItemStack[] machineRecipes, BlockFace trigger, String[] keys, Object[] values) {
|
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);
|
super(category, item, id, RecipeType.MULTIBLOCK, recipe, keys, values);
|
||||||
this.recipes = new ArrayList<>();
|
this.recipes = new ArrayList<>();
|
||||||
@ -58,26 +58,26 @@ public class SlimefunMachine extends SlimefunItem implements RecipeDisplayItem {
|
|||||||
this.shownRecipes.addAll(Arrays.asList(machineRecipes));
|
this.shownRecipes.addAll(Arrays.asList(machineRecipes));
|
||||||
this.trigger = trigger;
|
this.trigger = trigger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ItemStack[]> getRecipes() {
|
public List<ItemStack[]> getRecipes() {
|
||||||
return recipes;
|
return recipes;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ItemStack> getDisplayRecipes() {
|
public List<ItemStack> getDisplayRecipes() {
|
||||||
return shownRecipes;
|
return shownRecipes;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addRecipe(ItemStack[] input, ItemStack output) {
|
public void addRecipe(ItemStack[] input, ItemStack output) {
|
||||||
recipes.add(input);
|
recipes.add(input);
|
||||||
recipes.add(new ItemStack[] {output});
|
recipes.add(new ItemStack[] {output});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void postRegister() {
|
public void postRegister() {
|
||||||
this.toMultiBlock().register();
|
this.toMultiBlock().register();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void install() {
|
public void install() {
|
||||||
for (ItemStack i: shownRecipes) {
|
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 if (i.getType() == Material.FLINT_AND_STEEL) mats.add(Material.FIRE);
|
||||||
else mats.add(i.getType());
|
else mats.add(i.getType());
|
||||||
}
|
}
|
||||||
|
|
||||||
return mats.toArray(new Material[mats.size()]);
|
return mats.toArray(new Material[mats.size()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public MultiBlock toMultiBlock() {
|
public MultiBlock toMultiBlock() {
|
||||||
return new MultiBlock(convertItemStacksToMaterial(this.getRecipe()), this.trigger);
|
return new MultiBlock(convertItemStacksToMaterial(this.getRecipe()), this.trigger);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Iterator<ItemStack[]> recipeIterator() {
|
public Iterator<ItemStack[]> recipeIterator() {
|
||||||
return this.recipes.iterator();
|
return this.recipes.iterator();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
private static BlockFace convertTriggerMaterial(ItemStack[] recipe, Material trigger) {
|
private static BlockFace convertTriggerMaterial(ItemStack[] recipe, Material trigger) {
|
||||||
return MultiBlock.convertTriggerMaterialToBlockFace(convertItemStacksToMaterial(recipe), trigger);
|
return MultiBlock.convertTriggerMaterialToBlockFace(convertItemStacksToMaterial(recipe), trigger);
|
||||||
|
@ -28,13 +28,7 @@ public class Compressor extends MultiBlockMachine {
|
|||||||
SlimefunItems.COMPRESSOR,
|
SlimefunItems.COMPRESSOR,
|
||||||
"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[] {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[] {new CustomItem(SlimefunItems.STONE_CHUNK, 4), new ItemStack(Material.COBBLESTONE)},
|
||||||
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
|
|
||||||
},
|
|
||||||
BlockFace.SELF
|
BlockFace.SELF
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -44,11 +38,6 @@ public class Compressor extends MultiBlockMachine {
|
|||||||
return recipes.stream().map(items -> items[0]).collect(Collectors.toList());
|
return recipes.stream().map(items -> items[0]).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void install() {
|
|
||||||
// Do nothing to prevent double-registration of recipes
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInteract(Player p, Block b) {
|
public void onInteract(Player p, Block b) {
|
||||||
Block dispBlock = b.getRelative(BlockFace.DOWN);
|
Block dispBlock = b.getRelative(BlockFace.DOWN);
|
||||||
|
Loading…
Reference in New Issue
Block a user