mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-05-08 16:00:31 +02:00
commit a2512ce03a
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -33,6 +33,7 @@
* Fixed #1834
* Fixed #1843
* Fixed #1873
* Fixed Electric Smeltery not prioritisting recipes
## Release Candidate 11 (25 Apr 2020)

13
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/PostSetup.java
View File

@ -5,6 +5,8 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@ -34,6 +36,7 @@ import me.mrCookieSlime.Slimefun.Lists.RecipeType;
import me.mrCookieSlime.Slimefun.Lists.SlimefunItems;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
import me.mrCookieSlime.Slimefun.api.Slimefun;
public final class PostSetup {
@ -190,7 +193,8 @@ public final class PostSetup {
private static void loadSmelteryRecipes() {
Smeltery smeltery = (Smeltery) SlimefunItems.SMELTERY.getItem();
if (smeltery != null) {
if (smeltery != null && !smeltery.isDisabled()) {
ItemStack[] input = null;
for (ItemStack[] recipe : smeltery.getRecipes()) {
@ -222,6 +226,13 @@ public final class PostSetup {
input = null;
}
}
for (SlimefunItem item : SlimefunPlugin.getRegistry().getEnabledSlimefunItems()) {
if (item instanceof AContainer && ((AContainer) item).getMachineIdentifier().equals("ELECTRIC_SMELTERY")) {
List<MachineRecipe> recipes = ((AContainer) item).getMachineRecipes();
Collections.sort(recipes, Comparator.comparingInt(recipe -> recipe == null ? 0 : -recipe.getInput().length));
}
}
}
}

4
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
View File

@ -165,6 +165,10 @@ public abstract class AContainer extends SlimefunItem implements InventoryBlock,
// Override this method to register your machine recipes
}
public List<MachineRecipe> getMachineRecipes() {
return recipes;
}
public List<ItemStack> getDisplayRecipes() {
List<ItemStack> displayRecipes = new ArrayList<>(recipes.size() * 2);