some cleanup
This commit is contained in:
parent
d3f591015e
commit
d6f599e03b
8
README
8
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.
|
||||
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.
|
||||
@ -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<String> 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<List<? extends String>> 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<Item> 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());
|
||||
}
|
||||
}
|
||||
|
||||
@ -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();
|
||||
}
|
||||
*/
|
||||
}
|
||||
@ -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();
|
||||
}
|
||||
*/
|
||||
}
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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<CreativeModeTab> CREATIVE_MODE_TABS =
|
||||
DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TravelersSuitcase.MODID);
|
||||
|
||||
public static final RegistryObject<CreativeModeTab> POCKET_GROUP = CREATIVE_MODE_TABS.register("pocket",
|
||||
public static final RegistryObject<CreativeModeTab> 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);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user