diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bad7c24..badbf86 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip +distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/top/r3944realms/lendandregret/Config.java b/src/main/java/top/r3944realms/lendandregret/Config.java deleted file mode 100644 index 32fd947..0000000 --- a/src/main/java/top/r3944realms/lendandregret/Config.java +++ /dev/null @@ -1,50 +0,0 @@ -package top.r3944realms.lendandregret; - -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.Identifier; -import net.minecraft.world.item.Item; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.event.config.ModConfigEvent; -import net.neoforged.neoforge.common.ModConfigSpec; - -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 Neo's config APIs -@EventBusSubscriber(modid = LendAndRegret.MOD_ID) -public class Config { - private static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder(); - - private static final ModConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER.comment("Whether to log the dirt block on common setup").define("logDirtBlock", true); - - private static final ModConfigSpec.IntValue MAGIC_NUMBER = BUILDER.comment("A magic number").defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE); - - public static final ModConfigSpec.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 ModConfigSpec.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 ModConfigSpec 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 String itemName && BuiltInRegistries.ITEM.containsKey(Identifier.parse(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 -> BuiltInRegistries.ITEM.getValue(Identifier.parse(itemName))).collect(Collectors.toSet()); - } -} diff --git a/src/main/java/top/r3944realms/lendandregret/LendAndRegret.java b/src/main/java/top/r3944realms/lendandregret/LendAndRegret.java index d89da17..5d7252b 100644 --- a/src/main/java/top/r3944realms/lendandregret/LendAndRegret.java +++ b/src/main/java/top/r3944realms/lendandregret/LendAndRegret.java @@ -2,119 +2,51 @@ package top.r3944realms.lendandregret; import com.mojang.logging.LogUtils; import net.minecraft.client.Minecraft; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.network.chat.Component; -import net.minecraft.world.food.FoodProperties; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.CreativeModeTabs; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.MapColor; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.Mod; -import net.neoforged.fml.config.ModConfig; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; import net.neoforged.neoforge.event.server.ServerStartingEvent; -import net.neoforged.neoforge.registries.DeferredBlock; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredItem; -import net.neoforged.neoforge.registries.DeferredRegister; import org.slf4j.Logger; +import top.r3944realms.lendandregret.contents.LARBlocks; +import top.r3944realms.lendandregret.contents.LARCreativeModeTab; +import top.r3944realms.lendandregret.contents.LARItems; -// The value here should match an entry in the META-INF/neoforge.mods.toml file @Mod(LendAndRegret.MOD_ID) public class LendAndRegret { - // Define mod id in a common place for everything to reference public static final String MOD_ID = "lendandregret"; - // Directly reference a slf4j logger private static final Logger LOGGER = LogUtils.getLogger(); - // Create a Deferred Register to hold Blocks which will all be registered under the "lendandregret" namespace - public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(MOD_ID); - // Create a Deferred Register to hold Items which will all be registered under the "lendandregret" namespace - public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MOD_ID); - // Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "lendandregret" namespace - public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MOD_ID); - // Creates a new Block with the id "lendandregret:example_block", combining the namespace and path - public static final DeferredBlock EXAMPLE_BLOCK = BLOCKS.registerSimpleBlock("example_block", () -> BlockBehaviour.Properties.of().mapColor(MapColor.STONE)); - // Creates a new BlockItem with the id "lendandregret:example_block", combining the namespace and path - public static final DeferredItem EXAMPLE_BLOCK_ITEM = ITEMS.registerSimpleBlockItem("example_block", EXAMPLE_BLOCK); - - // Creates a new food item with the id "lendandregret:example_id", nutrition 1 and saturation 2 - public static final DeferredItem EXAMPLE_ITEM = ITEMS.registerSimpleItem("example_item", () -> new Item.Properties().food(new FoodProperties.Builder().alwaysEdible().nutrition(1).saturationModifier(2f).build())); - - // Creates a creative tab with the id "lendandregret:example_tab" for the example item, that is placed after the combat tab - public static final DeferredHolder EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder().title(Component.translatable("itemGroup.lendandregret")).withTabsBefore(CreativeModeTabs.COMBAT).icon(() -> EXAMPLE_ITEM.get().getDefaultInstance()).displayItems((parameters, output) -> { - output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event - }).build()); - - // The constructor for the mod class is the first code that is run when your mod is loaded. - // FML will recognize some parameter types like IEventBus or ModContainer and pass them in automatically. public LendAndRegret(IEventBus modEventBus, ModContainer modContainer) { - // Register the commonSetup method for modloading modEventBus.addListener(this::commonSetup); - // Register the Deferred Register to the mod event bus so blocks get registered - BLOCKS.register(modEventBus); - // Register the Deferred Register to the mod event bus so items get registered - ITEMS.register(modEventBus); - // Register the Deferred Register to the mod event bus so tabs get registered - CREATIVE_MODE_TABS.register(modEventBus); + LARItems.ITEMS.register(modEventBus); + LARBlocks.BLOCKS.register(modEventBus); + LARCreativeModeTab.CREATIVE_MODE_TABS.register(modEventBus); - // Register ourselves for server and other game events we are interested in. - // Note that this is necessary if and only if we want *this* class (lendandregret) to respond directly to events. - // Do not add this line if there are no @SubscribeEvent-annotated functions in this class, like onServerStarting() below. NeoForge.EVENT_BUS.register(this); - - // Register the item to a creative tab - modEventBus.addListener(this::addCreative); - - // Register our mod's ModConfigSpec so that FML can create and load the config file for us - modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC); } private void commonSetup(final FMLCommonSetupEvent event) { - // Some common setup code - LOGGER.info("HELLO FROM COMMON SETUP"); - - if (Config.logDirtBlock) LOGGER.info("DIRT BLOCK >> {}", BuiltInRegistries.BLOCK.getKey(Blocks.DIRT)); - - LOGGER.info(Config.magicNumberIntroduction + Config.magicNumber); - - Config.items.forEach((item) -> LOGGER.info("ITEM >> {}", item.toString())); + LOGGER.info("Lend & Regret common setup complete"); } - // Add the example block item to the building blocks tab - private void addCreative(BuildCreativeModeTabContentsEvent event) { - if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) event.accept(EXAMPLE_BLOCK_ITEM); - } - - // You can use SubscribeEvent and let the Event Bus discover methods to call @SubscribeEvent public void onServerStarting(ServerStartingEvent event) { - // Do something when the server starts - LOGGER.info("HELLO from server starting"); + LOGGER.info("Lend & Regret server starting"); } - // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent @EventBusSubscriber(modid = MOD_ID, value = Dist.CLIENT) public static class ClientModEvents { @SubscribeEvent - public static void onClientSetup(FMLClientSetupEvent event) { - // Some client setup code - LOGGER.info("HELLO FROM CLIENT SETUP"); - LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName()); + static void onClientSetup(FMLClientSetupEvent event) { + LOGGER.info("Lend & Regret client setup"); + LOGGER.info("Player: {}", Minecraft.getInstance().getUser().getName()); } } } diff --git a/src/main/java/top/r3944realms/lendandregret/contents/LARBlocks.java b/src/main/java/top/r3944realms/lendandregret/contents/LARBlocks.java new file mode 100644 index 0000000..6f932cc --- /dev/null +++ b/src/main/java/top/r3944realms/lendandregret/contents/LARBlocks.java @@ -0,0 +1,8 @@ +package top.r3944realms.lendandregret.contents; + +import net.neoforged.neoforge.registries.DeferredRegister; +import top.r3944realms.lendandregret.LendAndRegret; + +public class LARBlocks { + public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(LendAndRegret.MOD_ID); +} diff --git a/src/main/java/top/r3944realms/lendandregret/contents/LARCreativeModeTab.java b/src/main/java/top/r3944realms/lendandregret/contents/LARCreativeModeTab.java new file mode 100644 index 0000000..4ee5d20 --- /dev/null +++ b/src/main/java/top/r3944realms/lendandregret/contents/LARCreativeModeTab.java @@ -0,0 +1,22 @@ +package top.r3944realms.lendandregret.contents; + +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; +import top.r3944realms.lendandregret.LendAndRegret; + +public class LARCreativeModeTab { + public static final DeferredRegister CREATIVE_MODE_TABS = + DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LendAndRegret.MOD_ID); + + public static final DeferredHolder MAIN_TAB = CREATIVE_MODE_TABS.register("main", + () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup.lendandregret")) + .icon(() -> LARItems.ICON_ITEM.get().getDefaultInstance()) + .displayItems((params, output) -> { + output.accept(LARItems.ICON_ITEM.get()); + }) + .build()); +} diff --git a/src/main/java/top/r3944realms/lendandregret/contents/LARItems.java b/src/main/java/top/r3944realms/lendandregret/contents/LARItems.java new file mode 100644 index 0000000..85b8399 --- /dev/null +++ b/src/main/java/top/r3944realms/lendandregret/contents/LARItems.java @@ -0,0 +1,12 @@ +package top.r3944realms.lendandregret.contents; + +import net.minecraft.world.item.Item; +import net.neoforged.neoforge.registries.DeferredItem; +import net.neoforged.neoforge.registries.DeferredRegister; +import top.r3944realms.lendandregret.LendAndRegret; + +public class LARItems { + public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(LendAndRegret.MOD_ID); + + public static final DeferredItem ICON_ITEM = ITEMS.registerSimpleItem("icon_item"); +} diff --git a/src/main/resources/assets/lendandregret/items/icon_item.json b/src/main/resources/assets/lendandregret/items/icon_item.json new file mode 100644 index 0000000..e5f6324 --- /dev/null +++ b/src/main/resources/assets/lendandregret/items/icon_item.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "lendandregret:item/icon_item" + } +} diff --git a/src/main/resources/assets/lendandregret/lang/en_us.json b/src/main/resources/assets/lendandregret/lang/en_us.json index a840a96..ab9d759 100644 --- a/src/main/resources/assets/lendandregret/lang/en_us.json +++ b/src/main/resources/assets/lendandregret/lang/en_us.json @@ -1,5 +1,4 @@ { - "itemGroup.lendandregret": "Example Mod Tab", - "block.lendandregret.example_block": "Example Block", - "item.lendandregret.example_item": "Example Item" + "itemGroup.lendandregret": "Lend & Regret", + "item.lendandregret.icon_item": "Lend & Regret" } diff --git a/src/main/resources/assets/lendandregret/lang/zh_cn.json b/src/main/resources/assets/lendandregret/lang/zh_cn.json new file mode 100644 index 0000000..7a0a2d6 --- /dev/null +++ b/src/main/resources/assets/lendandregret/lang/zh_cn.json @@ -0,0 +1,4 @@ +{ + "itemGroup.lendandregret": "有借无还", + "item.lendandregret.icon_item": "有借无还模组图标" +} diff --git a/src/main/resources/assets/lendandregret/models/item/icon_item.json b/src/main/resources/assets/lendandregret/models/item/icon_item.json new file mode 100644 index 0000000..c203bd6 --- /dev/null +++ b/src/main/resources/assets/lendandregret/models/item/icon_item.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "lendandregret:item/icon" + } +} diff --git a/src/main/resources/assets/lendandregret/textures/item/icon.png b/src/main/resources/assets/lendandregret/textures/item/icon.png new file mode 100644 index 0000000..aa6b8ee Binary files /dev/null and b/src/main/resources/assets/lendandregret/textures/item/icon.png differ diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png new file mode 100644 index 0000000..aa6b8ee Binary files /dev/null and b/src/main/resources/icon.png differ diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index 81e4af1..3ab1d03 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -25,7 +25,7 @@ displayName = "${mod_name}" #mandatory # A URL for the "homepage" for this mod, displayed in the mod UI #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional # A file name (in the root of the mod JAR) containing a logo for display -#logoFile="lendandregret.png" #optional +logoFile="icon.png" #optional # A text field displayed in the mod UI #credits="" #optional # A text field displayed in the mod UI