From 168f916baa5d704e50d264f9494bd040415af625 Mon Sep 17 00:00:00 2001 From: Hedzer Kuijlman Date: Fri, 11 Apr 2025 14:07:19 +0200 Subject: [PATCH] Moved features to "features" package --- src/main/java/wtf/hak/survivalfabric/SurvivalFabric.java | 4 ++-- .../sharedenderchest/SharedEnderChest.java | 3 +-- .../{ => features}/sharedenderchest/SharedInventory.java | 2 +- .../survivalfabric/{ => features}/veinminer/Drill.java | 2 +- .../{ => features}/veinminer/VeinMinerEvents.java | 9 ++++----- .../{ => features}/veinminer/VeinMinerSession.java | 2 +- .../{ => features}/veinminer/drills/DrillBase.java | 6 +++--- .../{ => features}/veinminer/drills/LeavesDrill.java | 4 ++-- .../{ => features}/veinminer/drills/OreDrill.java | 5 ++--- .../{ => features}/veinminer/drills/WoodDrill.java | 4 ++-- 10 files changed, 19 insertions(+), 22 deletions(-) rename src/main/java/wtf/hak/survivalfabric/{ => features}/sharedenderchest/SharedEnderChest.java (98%) rename src/main/java/wtf/hak/survivalfabric/{ => features}/sharedenderchest/SharedInventory.java (97%) rename src/main/java/wtf/hak/survivalfabric/{ => features}/veinminer/Drill.java (81%) rename src/main/java/wtf/hak/survivalfabric/{ => features}/veinminer/VeinMinerEvents.java (87%) rename src/main/java/wtf/hak/survivalfabric/{ => features}/veinminer/VeinMinerSession.java (97%) rename src/main/java/wtf/hak/survivalfabric/{ => features}/veinminer/drills/DrillBase.java (95%) rename src/main/java/wtf/hak/survivalfabric/{ => features}/veinminer/drills/LeavesDrill.java (94%) rename src/main/java/wtf/hak/survivalfabric/{ => features}/veinminer/drills/OreDrill.java (93%) rename src/main/java/wtf/hak/survivalfabric/{ => features}/veinminer/drills/WoodDrill.java (95%) diff --git a/src/main/java/wtf/hak/survivalfabric/SurvivalFabric.java b/src/main/java/wtf/hak/survivalfabric/SurvivalFabric.java index 3122f1d..23043a2 100644 --- a/src/main/java/wtf/hak/survivalfabric/SurvivalFabric.java +++ b/src/main/java/wtf/hak/survivalfabric/SurvivalFabric.java @@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory; import wtf.hak.survivalfabric.commands.ReloadConfigCommand; import wtf.hak.survivalfabric.commands.SlimeChunkCommand; import wtf.hak.survivalfabric.commands.SpectatorCommand; -import wtf.hak.survivalfabric.sharedenderchest.SharedEnderChest; -import wtf.hak.survivalfabric.veinminer.VeinMinerEvents; +import wtf.hak.survivalfabric.features.sharedenderchest.SharedEnderChest; +import wtf.hak.survivalfabric.features.veinminer.VeinMinerEvents; import static wtf.hak.survivalfabric.config.ConfigManager.getConfig; diff --git a/src/main/java/wtf/hak/survivalfabric/sharedenderchest/SharedEnderChest.java b/src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedEnderChest.java similarity index 98% rename from src/main/java/wtf/hak/survivalfabric/sharedenderchest/SharedEnderChest.java rename to src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedEnderChest.java index ae428e7..d14a83a 100644 --- a/src/main/java/wtf/hak/survivalfabric/sharedenderchest/SharedEnderChest.java +++ b/src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedEnderChest.java @@ -1,4 +1,4 @@ -package wtf.hak.survivalfabric.sharedenderchest; +package wtf.hak.survivalfabric.features.sharedenderchest; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -21,7 +21,6 @@ import net.minecraft.nbt.NbtSizeTracker; import net.minecraft.screen.GenericContainerScreenHandler; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; diff --git a/src/main/java/wtf/hak/survivalfabric/sharedenderchest/SharedInventory.java b/src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedInventory.java similarity index 97% rename from src/main/java/wtf/hak/survivalfabric/sharedenderchest/SharedInventory.java rename to src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedInventory.java index 82af0df..0deb00b 100644 --- a/src/main/java/wtf/hak/survivalfabric/sharedenderchest/SharedInventory.java +++ b/src/main/java/wtf/hak/survivalfabric/features/sharedenderchest/SharedInventory.java @@ -1,4 +1,4 @@ -package wtf.hak.survivalfabric.sharedenderchest; +package wtf.hak.survivalfabric.features.sharedenderchest; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventories; diff --git a/src/main/java/wtf/hak/survivalfabric/veinminer/Drill.java b/src/main/java/wtf/hak/survivalfabric/features/veinminer/Drill.java similarity index 81% rename from src/main/java/wtf/hak/survivalfabric/veinminer/Drill.java rename to src/main/java/wtf/hak/survivalfabric/features/veinminer/Drill.java index 7e40255..35e8408 100644 --- a/src/main/java/wtf/hak/survivalfabric/veinminer/Drill.java +++ b/src/main/java/wtf/hak/survivalfabric/features/veinminer/Drill.java @@ -1,4 +1,4 @@ -package wtf.hak.survivalfabric.veinminer; +package wtf.hak.survivalfabric.features.veinminer; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/wtf/hak/survivalfabric/veinminer/VeinMinerEvents.java b/src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerEvents.java similarity index 87% rename from src/main/java/wtf/hak/survivalfabric/veinminer/VeinMinerEvents.java rename to src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerEvents.java index 320547a..b31537d 100644 --- a/src/main/java/wtf/hak/survivalfabric/veinminer/VeinMinerEvents.java +++ b/src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerEvents.java @@ -1,15 +1,14 @@ -package wtf.hak.survivalfabric.veinminer; +package wtf.hak.survivalfabric.features.veinminer; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; -import net.minecraft.registry.Registries; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import wtf.hak.survivalfabric.veinminer.drills.LeavesDrill; -import wtf.hak.survivalfabric.veinminer.drills.OreDrill; -import wtf.hak.survivalfabric.veinminer.drills.WoodDrill; +import wtf.hak.survivalfabric.features.veinminer.drills.LeavesDrill; +import wtf.hak.survivalfabric.features.veinminer.drills.OreDrill; +import wtf.hak.survivalfabric.features.veinminer.drills.WoodDrill; public class VeinMinerEvents { diff --git a/src/main/java/wtf/hak/survivalfabric/veinminer/VeinMinerSession.java b/src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerSession.java similarity index 97% rename from src/main/java/wtf/hak/survivalfabric/veinminer/VeinMinerSession.java rename to src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerSession.java index fa7b6f6..08e6eb1 100644 --- a/src/main/java/wtf/hak/survivalfabric/veinminer/VeinMinerSession.java +++ b/src/main/java/wtf/hak/survivalfabric/features/veinminer/VeinMinerSession.java @@ -1,4 +1,4 @@ -package wtf.hak.survivalfabric.veinminer; +package wtf.hak.survivalfabric.features.veinminer; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/wtf/hak/survivalfabric/veinminer/drills/DrillBase.java b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/DrillBase.java similarity index 95% rename from src/main/java/wtf/hak/survivalfabric/veinminer/drills/DrillBase.java rename to src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/DrillBase.java index 8d13d44..977ff12 100644 --- a/src/main/java/wtf/hak/survivalfabric/veinminer/drills/DrillBase.java +++ b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/DrillBase.java @@ -1,4 +1,4 @@ -package wtf.hak.survivalfabric.veinminer.drills; +package wtf.hak.survivalfabric.features.veinminer.drills; import net.minecraft.block.BlockState; import java.util.ArrayList; @@ -8,8 +8,8 @@ import net.minecraft.text.MutableText; import net.minecraft.text.PlainTextContent; import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; -import wtf.hak.survivalfabric.veinminer.Drill; -import wtf.hak.survivalfabric.veinminer.VeinMinerSession; +import wtf.hak.survivalfabric.features.veinminer.Drill; +import wtf.hak.survivalfabric.features.veinminer.VeinMinerSession; import static wtf.hak.survivalfabric.SurvivalFabric.LOGGER; diff --git a/src/main/java/wtf/hak/survivalfabric/veinminer/drills/LeavesDrill.java b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/LeavesDrill.java similarity index 94% rename from src/main/java/wtf/hak/survivalfabric/veinminer/drills/LeavesDrill.java rename to src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/LeavesDrill.java index 6718108..4e1effd 100644 --- a/src/main/java/wtf/hak/survivalfabric/veinminer/drills/LeavesDrill.java +++ b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/LeavesDrill.java @@ -1,4 +1,4 @@ -package wtf.hak.survivalfabric.veinminer.drills; +package wtf.hak.survivalfabric.features.veinminer.drills; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -7,7 +7,7 @@ import net.minecraft.registry.tag.TagKey; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import wtf.hak.survivalfabric.veinminer.VeinMinerSession; +import wtf.hak.survivalfabric.features.veinminer.VeinMinerSession; import java.util.ArrayDeque; diff --git a/src/main/java/wtf/hak/survivalfabric/veinminer/drills/OreDrill.java b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/OreDrill.java similarity index 93% rename from src/main/java/wtf/hak/survivalfabric/veinminer/drills/OreDrill.java rename to src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/OreDrill.java index fec8e6f..14664f3 100644 --- a/src/main/java/wtf/hak/survivalfabric/veinminer/drills/OreDrill.java +++ b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/OreDrill.java @@ -1,4 +1,4 @@ -package wtf.hak.survivalfabric.veinminer.drills; +package wtf.hak.survivalfabric.features.veinminer.drills; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -9,9 +9,8 @@ import net.minecraft.util.Identifier; import java.util.ArrayDeque; -import net.minecraft.registry.Registries; import net.minecraft.util.math.BlockPos; -import wtf.hak.survivalfabric.veinminer.VeinMinerSession; +import wtf.hak.survivalfabric.features.veinminer.VeinMinerSession; import static wtf.hak.survivalfabric.config.ConfigManager.getConfig; diff --git a/src/main/java/wtf/hak/survivalfabric/veinminer/drills/WoodDrill.java b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/WoodDrill.java similarity index 95% rename from src/main/java/wtf/hak/survivalfabric/veinminer/drills/WoodDrill.java rename to src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/WoodDrill.java index 1e57a4c..3540621 100644 --- a/src/main/java/wtf/hak/survivalfabric/veinminer/drills/WoodDrill.java +++ b/src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/WoodDrill.java @@ -1,4 +1,4 @@ -package wtf.hak.survivalfabric.veinminer.drills; +package wtf.hak.survivalfabric.features.veinminer.drills; import net.minecraft.block.BlockState; import net.minecraft.registry.RegistryKeys; @@ -12,7 +12,7 @@ import java.util.ArrayDeque; import net.minecraft.block.Block; import net.minecraft.registry.Registries; import net.minecraft.util.math.BlockPos; -import wtf.hak.survivalfabric.veinminer.VeinMinerSession; +import wtf.hak.survivalfabric.features.veinminer.VeinMinerSession; import static wtf.hak.survivalfabric.config.ConfigManager.getConfig;