diff --git a/src/main/java/de/jottyfan/minecraft/Quickly.java b/src/main/java/de/jottyfan/minecraft/Quickly.java index 483228c..96e23e5 100644 --- a/src/main/java/de/jottyfan/minecraft/Quickly.java +++ b/src/main/java/de/jottyfan/minecraft/Quickly.java @@ -1,6 +1,6 @@ package de.jottyfan.minecraft; -import java.util.Set; +import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,8 +30,8 @@ public class Quickly implements ModInitializer { public void onInitialize() { LOGGER.info("loading {}", MOD_ID); - Set items = QuicklyItems.registerModItems(); - Set blocks = QuicklyBlocks.registerModBlocks(); + List items = QuicklyItems.registerModItems(); + List blocks = QuicklyBlocks.registerModBlocks(); QuicklyBlockEntity.registerBlockEntities(); QuicklyFeatures.registerFeatures(); QuicklyComposter.registerComposterItems(); diff --git a/src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java b/src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java index 6b51ee2..d720a37 100644 --- a/src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java @@ -1,7 +1,7 @@ package de.jottyfan.minecraft.block; -import java.util.HashSet; -import java.util.Set; +import java.util.ArrayList; +import java.util.List; import java.util.function.Function; import de.jottyfan.minecraft.Quickly; @@ -102,15 +102,13 @@ public class QuicklyBlocks { return BuiltInRegistries.BLOCK.getValue(identifier); } - public static final Set registerModBlocks() { + public static final List registerModBlocks() { Quickly.LOGGER.debug("register blocks"); - Set set = new HashSet<>(); + List set = new ArrayList<>(); set.add(KELPBUNDLE); set.add(TURQUOISEBLOCK); set.add(ORETURQUOISE); set.add(OREDEEPSLATETURQUOISE); - set.add(COTTONPLANT); - set.add(CANOLAPLANT); set.add(LAVAHOARDER); set.add(QUICKIEPOWDER); set.add(SPEEDPOWDER); diff --git a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java index 7550ddd..676b301 100644 --- a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java +++ b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java @@ -1,7 +1,7 @@ package de.jottyfan.minecraft.item; -import java.util.HashSet; -import java.util.Set; +import java.util.ArrayList; +import java.util.List; import java.util.function.Function; import de.jottyfan.minecraft.Quickly; @@ -99,17 +99,15 @@ public class QuicklyItems { return Registry.register(BuiltInRegistries.ITEM, identifier, item); } - public static final Set registerModItems() { + public static final List registerModItems() { Quickly.LOGGER.debug("adding Items"); - Set set = new HashSet<>(); + List set = new ArrayList<>(); set.add(STUB); set.add(RAWTURQUOISE); set.add(TURQUOISEINGOT); set.add(COTTON); - set.add(COTTONPLANT); set.add(COTTONSEED); set.add(CANOLA); - set.add(CANOLAPLANT); set.add(CANOLASEED); set.add(CANOLABOTTLE); set.add(CANOLABOTTLESTACK); @@ -139,12 +137,6 @@ public class QuicklyItems { set.add(QUICKIESHEARS); set.add(QUICKIESHOVEL); set.add(QUICKIEWATERHOE); - set.add(QUICKIEAXE); - set.add(QUICKIEHOE); - set.add(QUICKIEPICKAXE); - set.add(QUICKIESHEARS); - set.add(QUICKIESHOVEL); - set.add(QUICKIEWATERHOE); set.add(ARMOR_TURQUOISE_BOOTS); set.add(ARMOR_TURQUOISE_HELMET); set.add(ARMOR_TURQUOISE_LEGGINGS); diff --git a/src/main/java/de/jottyfan/minecraft/tab/QuicklyTab.java b/src/main/java/de/jottyfan/minecraft/tab/QuicklyTab.java index 9c56fee..8ad4158 100644 --- a/src/main/java/de/jottyfan/minecraft/tab/QuicklyTab.java +++ b/src/main/java/de/jottyfan/minecraft/tab/QuicklyTab.java @@ -1,6 +1,6 @@ package de.jottyfan.minecraft.tab; -import java.util.Set; +import java.util.List; import de.jottyfan.minecraft.Quickly; import de.jottyfan.minecraft.item.QuicklyItems; @@ -23,11 +23,11 @@ import net.minecraft.world.level.block.Block; */ public class QuicklyTab { - public static final void registerItemGroup(Set items, Set blocks) { + public static final void registerItemGroup(List items, List blocks) { ResourceKey tabKey = ResourceKey.create(Registries.CREATIVE_MODE_TAB, Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "itemgroup")); - CreativeModeTab quicklyTab = FabricCreativeModeTab.builder().icon(() -> new ItemStack(QuicklyItems.SPEEDPICKAXE)) + CreativeModeTab quicklyTab = FabricCreativeModeTab.builder().icon(() -> new ItemStack(QuicklyItems.QUICKIEPICKAXE)) .title(Component.translatable("tab.quickly")).displayItems((params, output) -> { for (Item item : items) { output.accept(item);