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

suggested changes

Browse Source
This commit is contained in:
Jeffrey Kosse 2022-10-17 12:34:44 +02:00
parent 3e776a7fba
commit e7d766e229
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
View File

@ -69,7 +69,7 @@ final class CargoUtils {
} }
Material type = block.getType(); Material type = block.getType();
return SlimefunTag.INVENTORY_BLOCKS.isTagged(type); return SlimefunTag.CARGO_SUPPORTED_INVENTORIES.isTagged(type);
} }
@Nonnull @Nonnull

2
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java
View File

@ -202,7 +202,7 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
protected boolean isValidInventory(@Nonnull Block block) { protected boolean isValidInventory(@Nonnull Block block) {
Material type = block.getType(); Material type = block.getType();
return SlimefunTag.STORAGE_BLOCKS.isTagged(type); return SlimefunTag.AUTO_CRAFTER_SUPPORTED_STORAGE.isTagged(type);
} }
/** /**

4
src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
View File

@ -267,12 +267,12 @@ public enum SlimefunTag implements Tag<Material> {
/** /**
* All storage blocks. * All storage blocks.
*/ */
STORAGE_BLOCKS, AUTO_CRAFTER_SUPPORTED_STORAGE,
/** /**
* All blocks with an inventory. * All blocks with an inventory.
*/ */
INVENTORY_BLOCKS, CARGO_SUPPORTED_INVENTORIES,
/** /**
* All tile entities. * All tile entities.

0
src/main/resources/tags/storage_blocks.json → src/main/resources/tags/auto_crafter_supported_storage.json
View File

8
src/main/resources/tags/inventory_blocks.json → src/main/resources/tags/cargo_supported_inventories.json
View File

@ -1,13 +1,15 @@
{ {
"values" : [ "values" : [
"#slimefun:storage_blocks", "#slimefun:shulker_boxes",
"minecraft:chest",
"minecraft:trapped_chest",
"minecraft:barrel",
"minecraft:furnace", "minecraft:furnace",
"minecraft:dispenser", "minecraft:dispenser",
"minecraft:dropper", "minecraft:dropper",
"minecraft:hopper", "minecraft:hopper",
"minecraft:brewing_stand", "minecraft:brewing_stand",
"minecraft:blast_furnace", "minecraft:blast_furnace",
"minecraft:smoker", "minecraft:smoker"
"minecraft:campfire"
] ]
} }

12
src/main/resources/tags/tile_entities.json
View File

@ -1,9 +1,19 @@
{ {
"values" : [ "values" : [
"#slimefun:shulker_boxes",
"#minecraft:signs", "#minecraft:signs",
"#minecraft:banners", "#minecraft:banners",
"#minecraft:beds", "#minecraft:beds",
"#slimefun:inventory_blocks", "minecraft:chest",
"minecraft:trapped_chest",
"minecraft:barrel",
"minecraft:furnace",
"minecraft:dispenser",
"minecraft:dropper",
"minecraft:hopper",
"minecraft:brewing_stand",
"minecraft:blast_furnace",
"minecraft:smoker",
"minecraft:beacon", "minecraft:beacon",
"minecraft:spawner", "minecraft:spawner",
"minecraft:note_block", "minecraft:note_block",