mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Merge branch 'master' into tags
This commit is contained in:
commit
4c530a4813
@ -10,6 +10,8 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AGenerator;
|
|||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineFuel;
|
||||||
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
public abstract class CoalGenerator extends AGenerator {
|
public abstract class CoalGenerator extends AGenerator {
|
||||||
|
|
||||||
public CoalGenerator(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
public CoalGenerator(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
|
||||||
@ -22,21 +24,62 @@ public abstract class CoalGenerator extends AGenerator {
|
|||||||
registerFuel(new MachineFuel(12, new ItemStack(Material.BLAZE_ROD)));
|
registerFuel(new MachineFuel(12, new ItemStack(Material.BLAZE_ROD)));
|
||||||
registerFuel(new MachineFuel(20, new ItemStack(Material.DRIED_KELP_BLOCK)));
|
registerFuel(new MachineFuel(20, new ItemStack(Material.DRIED_KELP_BLOCK)));
|
||||||
|
|
||||||
|
// Boats
|
||||||
|
for (Material mat : Tag.ITEMS_BOATS.getValues()) {
|
||||||
|
registerFuel(new MachineFuel(5, new ItemStack(mat)));
|
||||||
|
}
|
||||||
|
|
||||||
// Coal & Charcoal
|
// Coal & Charcoal
|
||||||
registerFuel(new MachineFuel(8, new ItemStack(Material.COAL)));
|
registerFuel(new MachineFuel(8, new ItemStack(Material.COAL)));
|
||||||
registerFuel(new MachineFuel(8, new ItemStack(Material.CHARCOAL)));
|
registerFuel(new MachineFuel(8, new ItemStack(Material.CHARCOAL)));
|
||||||
|
|
||||||
// Logs
|
// Logs
|
||||||
for (Material mat : Tag.LOGS.getValues()) {
|
for (Material mat : Tag.LOGS.getValues()) {
|
||||||
registerFuel(new MachineFuel(2, new ItemStack(mat)));
|
registerFuel(new MachineFuel(4, new ItemStack(mat)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wooden Planks
|
// Wooden Planks
|
||||||
for (Material mat : Tag.PLANKS.getValues()) {
|
for (Material mat : Tag.PLANKS.getValues()) {
|
||||||
registerFuel(new MachineFuel(1, new ItemStack(mat)));
|
registerFuel(new MachineFuel(1, new ItemStack(mat)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Wooden Slabs
|
||||||
|
for (Material mat : Tag.WOODEN_SLABS.getValues()) {
|
||||||
|
registerFuel(new MachineFuel(1, new ItemStack(mat)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wooden Buttons
|
||||||
|
for (Material mat : Tag.WOODEN_BUTTONS.getValues()) {
|
||||||
|
registerFuel(new MachineFuel(1, new ItemStack(mat)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wooden Fences
|
||||||
|
for (Material mat : Tag.WOODEN_FENCES.getValues()) {
|
||||||
|
registerFuel(new MachineFuel(1, new ItemStack(mat)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// wooden Trapdoors
|
||||||
|
for (Material mat : Tag.WOODEN_TRAPDOORS.getValues()) {
|
||||||
|
registerFuel(new MachineFuel(3, new ItemStack(mat)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wooden Pressure Plates
|
||||||
|
for (Material mat : Tag.WOODEN_PRESSURE_PLATES.getValues()) {
|
||||||
|
registerFuel(new MachineFuel(2, new ItemStack(mat)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wooden Doors
|
||||||
|
for (Material mat : Tag.WOODEN_DOORS.getValues()) {
|
||||||
|
registerFuel(new MachineFuel(2, new ItemStack(mat)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Signs
|
||||||
|
for (Material mat : Tag.SIGNS.getValues()) {
|
||||||
|
registerFuel(new MachineFuel(2, new ItemStack(mat)));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getProgressBar() {
|
public ItemStack getProgressBar() {
|
||||||
return new ItemStack(Material.FLINT_AND_STEEL);
|
return new ItemStack(Material.FLINT_AND_STEEL);
|
||||||
|
@ -1,21 +1,5 @@
|
|||||||
package io.github.thebusybiscuit.slimefun4.testing;
|
package io.github.thebusybiscuit.slimefun4.testing;
|
||||||
|
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
|
||||||
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.NamespacedKey;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.event.inventory.InventoryType;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
import org.bukkit.plugin.Plugin;
|
|
||||||
import org.junit.jupiter.api.Assertions;
|
|
||||||
import org.mockito.Mockito;
|
|
||||||
|
|
||||||
import be.seeseemelk.mockbukkit.ServerMock;
|
import be.seeseemelk.mockbukkit.ServerMock;
|
||||||
import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
|
import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
|
||||||
import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile;
|
import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile;
|
||||||
@ -25,6 +9,21 @@ import io.github.thebusybiscuit.slimefun4.testing.mocks.MockSlimefunItem;
|
|||||||
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.NamespacedKey;
|
||||||
|
import org.bukkit.OfflinePlayer;
|
||||||
|
import org.bukkit.event.inventory.InventoryType;
|
||||||
|
import org.bukkit.inventory.Inventory;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
import org.bukkit.plugin.Plugin;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.mockito.Mockito;
|
||||||
|
|
||||||
|
import java.util.concurrent.CountDownLatch;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
public final class TestUtilities {
|
public final class TestUtilities {
|
||||||
|
|
||||||
@ -73,27 +72,66 @@ public final class TestUtilities {
|
|||||||
public static void registerDefaultTags(ServerMock server) {
|
public static void registerDefaultTags(ServerMock server) {
|
||||||
// We really don't need these to be accurate, just fill them with some examples
|
// We really don't need these to be accurate, just fill them with some examples
|
||||||
// that approximate the actual content
|
// that approximate the actual content
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("dirt_like"), Material.DIRT, Material.PODZOL, Material.MYCELIUM);
|
server.createMaterialTag(NamespacedKey.minecraft("logs"), Material.OAK_LOG,
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("logs"), Material.OAK_LOG, Material.STRIPPED_OAK_LOG, Material.OAK_WOOD, Material.STRIPPED_OAK_WOOD, Material.ACACIA_LOG, Material.STRIPPED_ACACIA_LOG, Material.ACACIA_WOOD, Material.STRIPPED_ACACIA_WOOD);
|
Material.STRIPPED_OAK_LOG, Material.OAK_WOOD, Material.STRIPPED_OAK_WOOD,
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("wooden_pressure_plates"), Material.OAK_PRESSURE_PLATE, Material.BIRCH_PRESSURE_PLATE, Material.SPRUCE_PRESSURE_PLATE, Material.JUNGLE_PRESSURE_PLATE, Material.ACACIA_PRESSURE_PLATE, Material.DARK_OAK_PRESSURE_PLATE);
|
Material.ACACIA_LOG, Material.STRIPPED_ACACIA_LOG, Material.ACACIA_WOOD, Material.STRIPPED_ACACIA_WOOD
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("wooden_trapdoors"), Material.OAK_TRAPDOOR, Material.BIRCH_TRAPDOOR, Material.SPRUCE_TRAPDOOR, Material.JUNGLE_TRAPDOOR, Material.ACACIA_TRAPDOOR, Material.DARK_OAK_TRAPDOOR);
|
);
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("wooden_slabs"), Material.OAK_SLAB, Material.BIRCH_SLAB, Material.JUNGLE_SLAB, Material.SPRUCE_SLAB, Material.ACACIA_SLAB, Material.DARK_OAK_SLAB);
|
server.createMaterialTag(NamespacedKey.minecraft("wooden_trapdoors"), Material.OAK_TRAPDOOR,
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("wooden_fences"), Material.OAK_FENCE, Material.BIRCH_FENCE, Material.JUNGLE_FENCE, Material.SPRUCE_FENCE, Material.ACACIA_FENCE, Material.DARK_OAK_FENCE);
|
Material.BIRCH_TRAPDOOR, Material.SPRUCE_TRAPDOOR, Material.JUNGLE_TRAPDOOR,
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("planks"), Material.OAK_PLANKS, Material.BIRCH_PLANKS, Material.SPRUCE_PLANKS, Material.JUNGLE_PLANKS, Material.ACACIA_PLANKS, Material.DARK_OAK_PLANKS);
|
Material.ACACIA_TRAPDOOR, Material.DARK_OAK_TRAPDOOR
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("small_flowers"), Material.POPPY, Material.DANDELION, Material.AZURE_BLUET, Material.LILY_OF_THE_VALLEY);
|
);
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("tall_flowers"), Material.PEONY, Material.SUNFLOWER);
|
server.createMaterialTag(NamespacedKey.minecraft("wooden_slabs"), Material.OAK_SLAB, Material.BIRCH_SLAB,
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("leaves"), Material.OAK_LEAVES, Material.BIRCH_LEAVES, Material.SPRUCE_LEAVES, Material.JUNGLE_LEAVES, Material.ACACIA_LEAVES, Material.DARK_OAK_LEAVES);
|
Material.JUNGLE_SLAB, Material.SPRUCE_SLAB, Material.ACACIA_SLAB, Material.DARK_OAK_SLAB
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("saplings"), Material.OAK_SAPLING, Material.BIRCH_SAPLING, Material.SPRUCE_SAPLING, Material.JUNGLE_SAPLING, Material.ACACIA_SAPLING, Material.DARK_OAK_SAPLING);
|
);
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("coral_blocks"), Material.BRAIN_CORAL_BLOCK, Material.BUBBLE_CORAL_BLOCK, Material.FIRE_CORAL_BLOCK, Material.HORN_CORAL_BLOCK, Material.TUBE_CORAL_BLOCK);
|
server.createMaterialTag(NamespacedKey.minecraft("wooden_fences"), Material.OAK_FENCE, Material.BIRCH_FENCE,
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("corals"), Material.BRAIN_CORAL, Material.BUBBLE_CORAL, Material.FIRE_CORAL, Material.HORN_CORAL, Material.TUBE_CORAL);
|
Material.JUNGLE_FENCE, Material.SPRUCE_FENCE, Material.ACACIA_FENCE, Material.DARK_OAK_FENCE
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("planks"), Material.OAK_PLANKS, Material.BIRCH_PLANKS,
|
||||||
|
Material.SPRUCE_PLANKS, Material.JUNGLE_PLANKS, Material.ACACIA_PLANKS, Material.DARK_OAK_PLANKS
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("small_flowers"), Material.POPPY, Material.DANDELION,
|
||||||
|
Material.AZURE_BLUET, Material.LILY_OF_THE_VALLEY
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("leaves"), Material.OAK_LEAVES, Material.BIRCH_LEAVES,
|
||||||
|
Material.SPRUCE_LEAVES, Material.JUNGLE_LEAVES, Material.ACACIA_LEAVES, Material.DARK_OAK_LEAVES
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("saplings"), Material.OAK_SAPLING, Material.BIRCH_SAPLING,
|
||||||
|
Material.SPRUCE_SAPLING, Material.JUNGLE_SAPLING, Material.ACACIA_SAPLING, Material.DARK_OAK_SAPLING
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("coral_blocks"), Material.BRAIN_CORAL_BLOCK,
|
||||||
|
Material.BUBBLE_CORAL_BLOCK, Material.FIRE_CORAL_BLOCK, Material.HORN_CORAL_BLOCK, Material.TUBE_CORAL_BLOCK
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("corals"), Material.BRAIN_CORAL, Material.BUBBLE_CORAL,
|
||||||
|
Material.FIRE_CORAL, Material.HORN_CORAL, Material.TUBE_CORAL
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("ice"), Material.ICE, Material.PACKED_ICE,
|
||||||
|
Material.FROSTED_ICE, Material.BLUE_ICE
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("boats"), Material.BIRCH_BOAT, Material.ACACIA_BOAT,
|
||||||
|
Material.DARK_OAK_BOAT, Material.JUNGLE_BOAT, Material.OAK_BOAT, Material.SPRUCE_BOAT
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("wooden_buttons"), Material.BIRCH_BUTTON,
|
||||||
|
Material.ACACIA_BUTTON, Material.SPRUCE_BUTTON, Material.DARK_OAK_BUTTON,
|
||||||
|
Material.JUNGLE_BOAT, Material.OAK_BUTTON
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("signs"), Material.SPRUCE_SIGN, Material.ACACIA_SIGN,
|
||||||
|
Material.OAK_SIGN, Material.JUNGLE_SIGN, Material.DARK_OAK_SIGN, Material.BIRCH_SIGN
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("wooden_doors"), Material.SPRUCE_DOOR, Material.ACACIA_DOOR,
|
||||||
|
Material.OAK_DOOR, Material.JUNGLE_DOOR, Material.DARK_OAK_DOOR, Material.BIRCH_DOOR
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("wooden_pressure_plates"), Material.SPRUCE_PRESSURE_PLATE,
|
||||||
|
Material.ACACIA_PRESSURE_PLATE, Material.OAK_PRESSURE_PLATE, Material.JUNGLE_PRESSURE_PLATE,
|
||||||
|
Material.DARK_OAK_PRESSURE_PLATE, Material.BIRCH_PRESSURE_PLATE
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("crops"), Material.WHEAT,
|
||||||
|
Material.CARROTS, Material.POTATOES, Material.BEETROOTS
|
||||||
|
);
|
||||||
|
server.createMaterialTag(NamespacedKey.minecraft("fire"), Material.FIRE, Material.SOUL_FIRE);
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("gold_ores"), Material.GOLD_ORE);
|
server.createMaterialTag(NamespacedKey.minecraft("gold_ores"), Material.GOLD_ORE);
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("sand"), Material.SAND, Material.RED_SAND);
|
server.createMaterialTag(NamespacedKey.minecraft("sand"), Material.SAND, Material.RED_SAND);
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("crops"), Material.WHEAT, Material.CARROTS, Material.POTATOES, Material.BEETROOTS);
|
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("ice"), Material.ICE, Material.PACKED_ICE, Material.FROSTED_ICE, Material.BLUE_ICE);
|
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("beds"), Material.RED_BED, Material.BLUE_BED);
|
server.createMaterialTag(NamespacedKey.minecraft("beds"), Material.RED_BED, Material.BLUE_BED);
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("fishes"), Material.COD, Material.SALMON);
|
server.createMaterialTag(NamespacedKey.minecraft("fishes"), Material.COD, Material.SALMON);
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("doors"), Material.OAK_DOOR, Material.IRON_DOOR);
|
server.createMaterialTag(NamespacedKey.minecraft("doors"), Material.OAK_DOOR, Material.IRON_DOOR);
|
||||||
server.createMaterialTag(NamespacedKey.minecraft("fire"), Material.FIRE, Material.SOUL_FIRE);
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user