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

Ore Crusher now also accepts Nether Gold Ore

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-06-25 15:27:18 +02:00
parent e66aa0baa5
commit d18af0c211
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -30,6 +30,9 @@
* Added Nether Quartz Ore Crusher Recipe
* Added a new language: Tagalog
* Added Magical Zombie Pills
* Added 1.13 compatibility to the Auto Drier
* (1.16+) Slimefun guide can now show Smithing Table recipes
* (1.16+) Added Nether Gold Ore recipe to the Ore Crusher
#### Changes
* Coolant Cells now last twice as long
@ -42,6 +45,7 @@
* Multi Tool lore now says "Crouch" instead of "Hold Shift"
* items which cannot be distributed by a Cargo Net will be dropped on the ground now instead of getting deleted
* Small performance improvements to the Cargo Net
* Slimefun no longer supports CraftBukkit
#### Fixes
* Fixed #2005

12
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java
View File

@ -14,6 +14,7 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion;
import io.github.thebusybiscuit.slimefun4.api.items.ItemSetting;
import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine;
import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
@ -43,6 +44,11 @@ public class OreCrusher extends MultiBlockMachine {
super.postRegister();
displayRecipes.addAll(Arrays.asList(new ItemStack(Material.COAL_ORE), doubleOres.getCoal(), new ItemStack(Material.LAPIS_ORE), doubleOres.getLapisLazuli(), new ItemStack(Material.REDSTONE_ORE), doubleOres.getRedstone(), new ItemStack(Material.DIAMOND_ORE), doubleOres.getDiamond(), new ItemStack(Material.EMERALD_ORE), doubleOres.getEmerald(), new ItemStack(Material.NETHER_QUARTZ_ORE), doubleOres.getNetherQuartz()));
if (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_16)) {
displayRecipes.add(new ItemStack(Material.NETHER_GOLD_ORE));
displayRecipes.add(doubleOres.getGoldNuggets());
}
}
@Override
@ -86,6 +92,7 @@ public class OreCrusher extends MultiBlockMachine {
private final ItemStack diamond = new ItemStack(Material.DIAMOND, 1);
private final ItemStack emerald = new ItemStack(Material.EMERALD, 1);
private final ItemStack quartz = new ItemStack(Material.QUARTZ, 1);
private final ItemStack goldNuggets = new ItemStack(Material.GOLD_NUGGET, 4);
public DoubleOreSetting() {
super("double-ores", true);
@ -98,6 +105,7 @@ public class OreCrusher extends MultiBlockMachine {
diamond.setAmount(value ? 2 : 1);
emerald.setAmount(value ? 2 : 1);
quartz.setAmount(value ? 2 : 1);
goldNuggets.setAmount(value ? 8 : 4);
SlimefunItem ironDust = SlimefunItem.getByID("IRON_DUST");
if (ironDust != null) {
@ -146,6 +154,10 @@ public class OreCrusher extends MultiBlockMachine {
return quartz;
}
public ItemStack getGoldNuggets() {
return goldNuggets;
}
}
}