From d6f599e03bc03af9f64058b71aa1ade943530926 Mon Sep 17 00:00:00 2001 From: candle Date: Sat, 10 May 2025 16:12:30 -0400 Subject: [PATCH] some cleanup --- README | 8 +- .../io/lampnet/travelerssuitcase/Config.java | 21 ----- .../travelerssuitcase/TravelersSuitcase.java | 21 ----- .../travelerssuitcase/Travelerssuitcase.java | 86 ------------------- .../travelerssuitcase/block/ModBlocks.java | 1 - .../block/PocketPortalBlock.java | 1 - .../block/SuitcaseBlock.java | 1 - .../block/entity/SuitcaseBlockEntity.java | 1 - .../travelerssuitcase/item/ModItemGroups.java | 10 +-- 9 files changed, 10 insertions(+), 140 deletions(-) delete mode 100644 src/main/java/io/lampnet/travelerssuitcase/Travelerssuitcase.java diff --git a/README b/README index e622bff..170e4a9 100644 --- a/README +++ b/README @@ -1,4 +1,6 @@ -Traveler's Suitcase [FORGE] -ORIGINAL: https://github.com/BennyBoops/PocketRepose +# Traveler's Suitcase [FORGE] -This is a forge port of the PocketRepose mod. \ No newline at end of file +A Forge port of the [PocketRepose](https://github.com/BennyBoops/PocketRepose) mod. [Modrinth](https://modrinth.com/mod/pocket-repose) + +## About +This mod allows players to create their own pocket dimensions through magical suitcases. \ No newline at end of file diff --git a/src/main/java/io/lampnet/travelerssuitcase/Config.java b/src/main/java/io/lampnet/travelerssuitcase/Config.java index 0490065..490a2a6 100644 --- a/src/main/java/io/lampnet/travelerssuitcase/Config.java +++ b/src/main/java/io/lampnet/travelerssuitcase/Config.java @@ -12,39 +12,18 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -// An example config class. This is not required, but it's a good idea to have one to keep your config organized. -// Demonstrates how to use Forge's config APIs @Mod.EventBusSubscriber(modid = TravelersSuitcase.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public class Config { private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder(); - private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER.comment("Whether to log the dirt block on common setup").define("logDirtBlock", true); - - private static final ForgeConfigSpec.IntValue MAGIC_NUMBER = BUILDER.comment("A magic number").defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE); - - public static final ForgeConfigSpec.ConfigValue MAGIC_NUMBER_INTRODUCTION = BUILDER.comment("What you want the introduction message to be for the magic number").define("magicNumberIntroduction", "The magic number is... "); - - // a list of strings that are treated as resource locations for items - private static final ForgeConfigSpec.ConfigValue> ITEM_STRINGS = BUILDER.comment("A list of items to log on common setup.").defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), Config::validateItemName); - static final ForgeConfigSpec SPEC = BUILDER.build(); - public static boolean logDirtBlock; - public static int magicNumber; - public static String magicNumberIntroduction; - public static Set items; - private static boolean validateItemName(final Object obj) { return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName)); } @SubscribeEvent static void onLoad(final ModConfigEvent event) { - logDirtBlock = LOG_DIRT_BLOCK.get(); - magicNumber = MAGIC_NUMBER.get(); - magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get(); - // convert the list of strings into a set of items - items = ITEM_STRINGS.get().stream().map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName))).collect(Collectors.toSet()); } } diff --git a/src/main/java/io/lampnet/travelerssuitcase/TravelersSuitcase.java b/src/main/java/io/lampnet/travelerssuitcase/TravelersSuitcase.java index 390d473..45068bf 100644 --- a/src/main/java/io/lampnet/travelerssuitcase/TravelersSuitcase.java +++ b/src/main/java/io/lampnet/travelerssuitcase/TravelersSuitcase.java @@ -2,8 +2,6 @@ package io.lampnet.travelerssuitcase; import io.lampnet.travelerssuitcase.block.ModBlocks; import io.lampnet.travelerssuitcase.block.entity.ModBlockEntities; -// import io.lampnet.travelerssuitcase.block.entity.SuitcaseBlockEntity; // Commented out for now -// import io.lampnet.travelerssuitcase.config.SuitcaseRegistryState; // Commented out for now import io.lampnet.travelerssuitcase.item.ModItemGroups; import io.lampnet.travelerssuitcase.item.ModItems; import net.minecraftforge.common.MinecraftForge; @@ -21,19 +19,13 @@ public class TravelersSuitcase { public TravelersSuitcase() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - // Register items, blocks, etc. ModItems.register(modEventBus); ModBlocks.register(modEventBus); ModItemGroups.register(modEventBus); ModBlockEntities.register(modEventBus); - // Register world load event MinecraftForge.EVENT_BUS.addListener(this::onWorldLoad); - // Register server events - // MinecraftForge.EVENT_BUS.addListener(this::onServerStarting); - // MinecraftForge.EVENT_BUS.addListener(this::onServerStopping); - LOGGER.info("Initializing " + MODID); } @@ -70,17 +62,4 @@ public class TravelersSuitcase { } } } - - /* Commented out for now - private void onServerStarting(net.minecraftforge.event.server.ServerStartingEvent event) { - SuitcaseRegistryState state = SuitcaseRegistryState.getState(event.getServer()); - SuitcaseBlockEntity.initializeSuitcaseRegistry(state.registry); - } - - private void onServerStopping(net.minecraftforge.event.server.ServerStoppingEvent event) { - SuitcaseRegistryState state = SuitcaseRegistryState.getState(event.getServer()); - SuitcaseBlockEntity.saveSuitcaseRegistryTo(state.registry); - state.setDirty(); - } - */ } \ No newline at end of file diff --git a/src/main/java/io/lampnet/travelerssuitcase/Travelerssuitcase.java b/src/main/java/io/lampnet/travelerssuitcase/Travelerssuitcase.java deleted file mode 100644 index 8c8fad5..0000000 --- a/src/main/java/io/lampnet/travelerssuitcase/Travelerssuitcase.java +++ /dev/null @@ -1,86 +0,0 @@ -package io.lampnet.travelerssuitcase; - -import io.lampnet.travelerssuitcase.block.ModBlocks; -import io.lampnet.travelerssuitcase.block.entity.ModBlockEntities; -// import io.lampnet.travelerssuitcase.block.entity.SuitcaseBlockEntity; // Commented out for now -// import io.lampnet.travelerssuitcase.config.SuitcaseRegistryState; // Commented out for now -import io.lampnet.travelerssuitcase.item.ModItemGroups; -import io.lampnet.travelerssuitcase.item.ModItems; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -@Mod(TravelersSuitcase.MODID) -public class Travelerssuitcase { - public static final String MODID = "travelerssuitcase"; - public static final Logger LOGGER = LogManager.getLogger(MODID); - - public Travelerssuitcase() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - - // Register items, blocks, etc. - ModItems.register(modEventBus); - ModBlocks.register(modEventBus); - ModItemGroups.register(modEventBus); - ModBlockEntities.register(modEventBus); - - // Register world load event - MinecraftForge.EVENT_BUS.addListener(this::onWorldLoad); - - // Register server events - // MinecraftForge.EVENT_BUS.addListener(this::onServerStarting); - // MinecraftForge.EVENT_BUS.addListener(this::onServerStopping); - - LOGGER.info("Initializing " + MODID); - } - - private void onWorldLoad(net.minecraftforge.event.level.LevelEvent.Load event) { - if (event.getLevel() instanceof net.minecraft.server.level.ServerLevel world) { - if (world.dimension().location().getNamespace().equals(MODID)) { - String dimensionName = world.dimension().location().getPath(); - java.nio.file.Path structureMarkerPath = world.getServer().getWorldPath(net.minecraft.world.level.storage.LevelResource.ROOT) - .resolve("data") - .resolve(MODID) - .resolve("pending_structures") - .resolve(dimensionName + ".txt"); - if (java.nio.file.Files.exists(structureMarkerPath)) { - try { - net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate template = world.getServer().getStructureManager() - .get(new net.minecraft.resources.ResourceLocation(MODID, "pocket_island_01")) - .orElse(null); - if (template != null) { - net.minecraft.core.BlockPos pos = new net.minecraft.core.BlockPos(0, 64, 0); - template.placeInWorld( - world, - pos, - pos, - new net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings(), - world.getRandom(), - net.minecraft.world.level.block.Block.UPDATE_ALL - ); - java.nio.file.Files.delete(structureMarkerPath); - } - } catch (java.io.IOException e) { - LOGGER.error("Failed to place structure", e); - } - } - } - } - } - - /* Commented out for now - private void onServerStarting(net.minecraftforge.event.server.ServerStartingEvent event) { - SuitcaseRegistryState state = SuitcaseRegistryState.getState(event.getServer()); - SuitcaseBlockEntity.initializeSuitcaseRegistry(state.registry); - } - - private void onServerStopping(net.minecraftforge.event.server.ServerStoppingEvent event) { - SuitcaseRegistryState state = SuitcaseRegistryState.getState(event.getServer()); - SuitcaseBlockEntity.saveSuitcaseRegistryTo(state.registry); - state.setDirty(); - } - */ -} \ No newline at end of file diff --git a/src/main/java/io/lampnet/travelerssuitcase/block/ModBlocks.java b/src/main/java/io/lampnet/travelerssuitcase/block/ModBlocks.java index 6494fb2..da2629f 100644 --- a/src/main/java/io/lampnet/travelerssuitcase/block/ModBlocks.java +++ b/src/main/java/io/lampnet/travelerssuitcase/block/ModBlocks.java @@ -8,7 +8,6 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/io/lampnet/travelerssuitcase/block/PocketPortalBlock.java b/src/main/java/io/lampnet/travelerssuitcase/block/PocketPortalBlock.java index 76d59ab..75789db 100644 --- a/src/main/java/io/lampnet/travelerssuitcase/block/PocketPortalBlock.java +++ b/src/main/java/io/lampnet/travelerssuitcase/block/PocketPortalBlock.java @@ -1,6 +1,5 @@ package io.lampnet.travelerssuitcase.block; -import io.lampnet.travelerssuitcase.TravelersSuitcase; import io.lampnet.travelerssuitcase.block.entity.SuitcaseBlockEntity; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/io/lampnet/travelerssuitcase/block/SuitcaseBlock.java b/src/main/java/io/lampnet/travelerssuitcase/block/SuitcaseBlock.java index fc20eea..9a65a0b 100644 --- a/src/main/java/io/lampnet/travelerssuitcase/block/SuitcaseBlock.java +++ b/src/main/java/io/lampnet/travelerssuitcase/block/SuitcaseBlock.java @@ -21,7 +21,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.StringTag; -import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/io/lampnet/travelerssuitcase/block/entity/SuitcaseBlockEntity.java b/src/main/java/io/lampnet/travelerssuitcase/block/entity/SuitcaseBlockEntity.java index 6fde79c..c285873 100644 --- a/src/main/java/io/lampnet/travelerssuitcase/block/entity/SuitcaseBlockEntity.java +++ b/src/main/java/io/lampnet/travelerssuitcase/block/entity/SuitcaseBlockEntity.java @@ -6,7 +6,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; -import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/io/lampnet/travelerssuitcase/item/ModItemGroups.java b/src/main/java/io/lampnet/travelerssuitcase/item/ModItemGroups.java index d034ba3..0a1c6ad 100644 --- a/src/main/java/io/lampnet/travelerssuitcase/item/ModItemGroups.java +++ b/src/main/java/io/lampnet/travelerssuitcase/item/ModItemGroups.java @@ -8,16 +8,16 @@ import net.minecraft.network.chat.Component; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; -import net.minecraft.core.registries.Registries; // For DeferredRegister.create(Registries.CREATIVE_MODE_TAB...) -import net.minecraft.world.level.block.Blocks; // For Blocks.ANVIL +import net.minecraft.core.registries.Registries; +import net.minecraft.world.level.block.Blocks; public class ModItemGroups { public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TravelersSuitcase.MODID); - public static final RegistryObject POCKET_GROUP = CREATIVE_MODE_TABS.register("pocket", + public static final RegistryObject SUITCASE_GROUP = CREATIVE_MODE_TABS.register("travelerssuitcase", () -> CreativeModeTab.builder() - .title(Component.translatable("itemgroup.travelerssuitcase.pocket")) // Changed itemgroup name + .title(Component.translatable("itemgroup.travelerssuitcase")) .icon(() -> new ItemStack(ModItems.KEYSTONE.get())) .displayItems((displayParameters, output) -> { output.accept(ModItems.KEYSTONE.get()); @@ -45,7 +45,7 @@ public class ModItemGroups { }) .build()); - public static void register(IEventBus eventBus) { // Renamed from registerItemGroups + public static void register(IEventBus eventBus) { CREATIVE_MODE_TABS.register(eventBus); TravelersSuitcase.LOGGER.info("Registering Creative Mode Tabs for " + TravelersSuitcase.MODID); }