From ea3fcb428d0817fb6f102c74a7c4a162124542bc Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 26 May 2025 20:25:04 +0100 Subject: [PATCH 1/7] Updated gradle and metadata. --- build.gradle | 106 ++---------------- gradle.properties | 59 +++------- settings.gradle | 3 +- .../Geologistpicktweaks.java | 2 +- src/main/resources/META-INF/mods.toml | 75 ++++--------- 5 files changed, 49 insertions(+), 196 deletions(-) diff --git a/build.gradle b/build.gradle index 8d62beb..9441636 100644 --- a/build.gradle +++ b/build.gradle @@ -2,14 +2,14 @@ plugins { id 'eclipse' id 'idea' id 'net.minecraftforge.gradle' version '[6.0.16,6.2)' + id 'org.parchmentmc.librarian.forgegradle' version '1.+' } - group = mod_group_id version = mod_version base { - archivesName = mod_id + archivesName = "${mod_id}-${minecraft_version}" } java { @@ -17,62 +17,18 @@ java { } minecraft { - // The mappings can be changed at any time and must be in the following format. - // Channel: Version: - // official MCVersion Official field/method names from Mojang mapping files - // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official - // - // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge - // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started - // - // Use non-default mappings at your own risk. They may not always work. - // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: mapping_channel, version: mapping_version + mappings channel: mapping_channel, version: "$mapping_version-$minecraft_version" - // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. - // In most cases, it is not necessary to enable. - // enableEclipsePrepareRuns = true - // enableIdeaPrepareRuns = true - - // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. - // It is REQUIRED to be set to true for this template to function. - // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html copyIdeResources = true - - // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. - // The folder name can be set on a run configuration using the "folderName" property. - // By default, the folder name of a run configuration is the name of the Gradle project containing it. // generateRunFolders = true + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ - // This property enables access transformers for use in development. - // They will be applied to the Minecraft artifact. - // The access transformer file can be anywhere in the project. - // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. - // This default location is a best practice to automatically put the file in the right place in the final jar. - // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - // Default run configurations. - // These can be tweaked, removed, or duplicated as needed. runs { // applies to all the run configs below configureEach { workingDirectory project.file('run') - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. property 'forge.logging.markers', 'REGISTRIES' - - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' mods { @@ -83,7 +39,6 @@ minecraft { } client { - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. property 'forge.enabledGameTestNamespaces', mod_id } @@ -92,66 +47,27 @@ minecraft { args '--nogui' } - // This run config launches GameTestServer and runs all registered gametests, then exits. - // By default, the server will crash when no gametests are provided. - // The gametest system is also enabled by default for other run configs under the /test command. gameTestServer { property 'forge.enabledGameTestNamespaces', mod_id } data { - // example of overriding the workingDirectory set in configureEach above workingDirectory project.file('run-data') - - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') } } } -// Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/generated/resources' } - -repositories { - // Put repositories for dependencies here - // ForgeGradle automatically adds the Forge maven and Maven Central for you - - // If you have mod jar dependencies in ./libs, you can declare them as a repository like so. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver - // flatDir { - // dir 'libs' - // } +sourceSets.main.resources { + srcDir 'src/generated/resources' } +repositories {} + dependencies { - // Specify the version of Minecraft to use. - // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. - // The "userdev" classifier will be requested and setup by ForgeGradle. - // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], - // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - - // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings - // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime - // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") - // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") - // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") - - // Example mod dependency using a mod jar from ./libs with a flat dir repository - // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar - // The group id is ignored when searching -- in this case, it is "blank" - // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") - - // For more info: - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - } -// This block of code expands all declared replace properties in the specified resource targets. -// A missing property will result in an error. Properties are expanded using ${} Groovy notation. -// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. -// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html tasks.named('processResources', ProcessResources).configure { var replaceProperties = [minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, forge_version : forge_version, forge_version_range: forge_version_range, @@ -166,22 +82,20 @@ tasks.named('processResources', ProcessResources).configure { } } -// Example for how to get properties into the manifest for reading at runtime. tasks.named('jar', Jar).configure { manifest { attributes(["Specification-Title" : mod_id, "Specification-Vendor" : mod_authors, - "Specification-Version" : "1", // We are version 1 of ourselves + "Specification-Version" : "1", "Implementation-Title" : project.name, "Implementation-Version" : project.jar.archiveVersion, "Implementation-Vendor" : mod_authors, "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")]) } - // This is the preferred method to reobfuscate your jar file finalizedBy 'reobfJar' } tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation + options.encoding = 'UTF-8' } diff --git a/gradle.properties b/gradle.properties index 06e443b..25eeb3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,49 +1,20 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -# The Minecraft version must agree with the Forge version to get a valid artifact -minecraft_version=1.20.1 -# The Minecraft version range can use any release version of Minecraft as bounds. -# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly -# as they do not follow standard versioning conventions. -minecraft_version_range=[1.20.1,1.21) -# The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=47.4.0 -# The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[47,) -# The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[47,) -# The mapping channel to use for mappings. -# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. -# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. -# -# | Channel | Version | | -# |-----------|----------------------|--------------------------------------------------------------------------------| -# | official | MCVersion | Official field/method names from Mojang mapping files | -# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official | -# -# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. -# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md -# -# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge. -# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started -mapping_channel=official -# The mapping version to query from the mapping channel. -# This must match the format required by the mapping channel. -mapping_version=1.20.1 -# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} -# Must match the String constant located in the main mod class annotated with @Mod. -mod_id=geologistpicktweaks -# The human-readable display name for the mod. -mod_name=GeologistPickTweaks -# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. + +mod_id=geologist_pick_tweaks +mod_name=Geologist Pick Tweaks mod_license=All Rights Reserved -# The mod version. See https://semver.org/ mod_version=1.0.0 -# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. -# This should match the base package used for the mod sources. -# See https://maven.apache.org/guides/mini/guide-naming-conventions.html mod_group_id=dev.micle -# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. -mod_authors= -# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description= +mod_authors=Micle +mod_description=A small mod that tweaks Immersive Geology's geologist pick logic. + +minecraft_version=1.20.1 +minecraft_version_range=[1.20.1,1.21) + +forge_version=47.4.0 +forge_version_range=[47,) +loader_version_range=[47,) + +mapping_channel=parchment +mapping_version=2023.09.03 diff --git a/settings.gradle b/settings.gradle index d005f18..08ad301 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,7 @@ pluginManagement { name = 'MinecraftForge' url = 'https://maven.minecraftforge.net/' } + maven { url = 'https://maven.parchmentmc.org' } } } @@ -12,4 +13,4 @@ plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' } -rootProject.name = 'geologistpicktweaks' +rootProject.name = "geologist_pick_tweaks-${minecraft_version}" diff --git a/src/main/java/dev/micle/geologistpicktweaks/Geologistpicktweaks.java b/src/main/java/dev/micle/geologistpicktweaks/Geologistpicktweaks.java index d4a4e0f..a54fc82 100644 --- a/src/main/java/dev/micle/geologistpicktweaks/Geologistpicktweaks.java +++ b/src/main/java/dev/micle/geologistpicktweaks/Geologistpicktweaks.java @@ -34,7 +34,7 @@ import org.slf4j.Logger; public class Geologistpicktweaks { // Define mod id in a common place for everything to reference - public static final String MODID = "geologistpicktweaks"; + public static final String MODID = "geologist_pick_tweaks"; // 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 "geologistpicktweaks" namespace diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index e8ad051..6d133b3 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,63 +1,30 @@ -# This is an example mods.toml file. It contains the data relating to the loading mods. -# There are several mandatory fields (#mandatory), and many more that are optional (#optional). -# The overall format is standard TOML format, v0.5.0. -# Note that there are a couple of TOML lists in this file. -# Find more information on toml format here: https://github.com/toml-lang/toml -# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml -modLoader = "javafml" #mandatory -# A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion = "${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. -# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. -# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +modLoader = "javafml" +loaderVersion = "${loader_version_range}" license = "${mod_license}" -# A URL to refer people to when problems occur with this mod -#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional -# A list of mods - how many allowed here is determined by the individual mod loader -[[mods]] #mandatory -# The modid of the mod -modId = "${mod_id}" #mandatory -# The version number of the mod -version = "${mod_version}" #mandatory -# A display name for the mod -displayName = "${mod_name}" #mandatory -# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ -#updateJSONURL="https://change.me.example.invalid/updates.json" #optional -# 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="geologistpicktweaks.png" #optional -# A text field displayed in the mod UI -#credits="Thanks for this example mod goes to Java" #optional -# A text field displayed in the mod UI -authors = "${mod_authors}" #optional -# Display Test controls the display for your mod in the server connection screen -# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. -# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. -# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component. -# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value. -# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. -#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) +issueTrackerURL="https://gitea.micle.dev/minecraft-mods/geologist_pick_tweaks/issues" -# The description text for the mod (multi line!) (#mandatory) +[[mods]] +modId = "${mod_id}" +version = "${mod_version}" +displayName = "${mod_name}" +#updateJSONURL="https://change.me.example.invalid/updates.json" # https://docs.minecraftforge.net/en/latest/misc/updatechecker/ +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" +logoFile="icon.png" +#credits="" +authors = "${mod_authors}" +displayTest="MATCH_VERSION" # MATCH_VERSION, IGNORE_SERVER_VERSION (server only), IGNORE_ALL_VERSION (client only), NONE (IExtensionPoint.DisplayTest) description = '''${mod_description}''' -# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies."${mod_id}"]] #optional -# the modid of the dependency -modId = "forge" #mandatory -# Does this dependency have to exist - if not, ordering below must be specified -mandatory = true #mandatory -# The version range of the dependency -versionRange = "${forge_version_range}" #mandatory -# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory -# BEFORE - This mod is loaded BEFORE the dependency -# AFTER - This mod is loaded AFTER the dependency -ordering = "NONE" -# Side this dependency is applied on - BOTH, CLIENT, or SERVER -side = "BOTH"# Here's another dependency + +[[dependencies."${mod_id}"]] +modId = "forge" +mandatory = true +versionRange = "${forge_version_range}" +ordering = "NONE" # BEFORE, AFTER, NONE +side = "BOTH" # BOTH, CLIENT, SERVER + [[dependencies."${mod_id}"]] modId = "minecraft" mandatory = true -# This version range declares a minimum of the current minecraft version up to but not including the next major version versionRange = "${minecraft_version_range}" ordering = "NONE" side = "BOTH" From 313ba000bb58674da27d4237d14cac48cf7e5657 Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 26 May 2025 20:26:53 +0100 Subject: [PATCH 2/7] WIP: Updated main class. --- .../GeologistPickTweaks.java | 28 +++++ .../Geologistpicktweaks.java | 118 ------------------ 2 files changed, 28 insertions(+), 118 deletions(-) create mode 100644 src/main/java/dev/micle/geologistpicktweaks/GeologistPickTweaks.java delete mode 100644 src/main/java/dev/micle/geologistpicktweaks/Geologistpicktweaks.java diff --git a/src/main/java/dev/micle/geologistpicktweaks/GeologistPickTweaks.java b/src/main/java/dev/micle/geologistpicktweaks/GeologistPickTweaks.java new file mode 100644 index 0000000..c53bba7 --- /dev/null +++ b/src/main/java/dev/micle/geologistpicktweaks/GeologistPickTweaks.java @@ -0,0 +1,28 @@ +package dev.micle.geologistpicktweaks; + +import com.mojang.logging.LogUtils; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.slf4j.Logger; + +@Mod(GeologistPickTweaks.MOD_ID) +public class GeologistPickTweaks { + public static final String MOD_ID = "geologist_pick_tweaks"; + public static final Logger LOGGER = LogUtils.getLogger(); + private static FMLJavaModLoadingContext fmlJavaModLoadingContext; + private static IProxy proxy; + + public GeologistPickTweaks(FMLJavaModLoadingContext context) { + fmlJavaModLoadingContext = context; + + proxy = DistExecutor.safeRunForDist( + () -> Proxy.Client::new, + () -> Proxy.Server::new + ); + } + + public static FMLJavaModLoadingContext getFMLJavaModLoadingContext() { + return fmlJavaModLoadingContext; + } +} diff --git a/src/main/java/dev/micle/geologistpicktweaks/Geologistpicktweaks.java b/src/main/java/dev/micle/geologistpicktweaks/Geologistpicktweaks.java deleted file mode 100644 index a54fc82..0000000 --- a/src/main/java/dev/micle/geologistpicktweaks/Geologistpicktweaks.java +++ /dev/null @@ -1,118 +0,0 @@ -package dev.micle.geologistpicktweaks; - -import com.mojang.logging.LogUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.core.registries.Registries; -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.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; -import net.minecraftforge.event.server.ServerStartingEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.config.ModConfig; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; -import org.slf4j.Logger; - -// The value here should match an entry in the META-INF/mods.toml file -@Mod(Geologistpicktweaks.MODID) -public class Geologistpicktweaks { - - // Define mod id in a common place for everything to reference - public static final String MODID = "geologist_pick_tweaks"; - // 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 "geologistpicktweaks" namespace - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID); - // Create a Deferred Register to hold Items which will all be registered under the "geologistpicktweaks" namespace - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID); - // Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "geologistpicktweaks" namespace - public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID); - - // Creates a new Block with the id "geologistpicktweaks:example_block", combining the namespace and path - public static final RegistryObject EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE))); - // Creates a new BlockItem with the id "geologistpicktweaks:example_block", combining the namespace and path - public static final RegistryObject EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties())); - - // Creates a new food item with the id "geologistpicktweaks:example_id", nutrition 1 and saturation 2 - public static final RegistryObject EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(1).saturationMod(2f).build()))); - - // Creates a creative tab with the id "geologistpicktweaks:example_tab" for the example item, that is placed after the combat tab - public static final RegistryObject EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder().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()); - - public Geologistpicktweaks() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - - // 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); - - // Register ourselves for server and other game events we are interested in - MinecraftForge.EVENT_BUS.register(this); - - // Register the item to a creative tab - modEventBus.addListener(this::addCreative); - - // Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC); - } - - private void commonSetup(final FMLCommonSetupEvent event) { - // Some common setup code - LOGGER.info("HELLO FROM COMMON SETUP"); - LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT)); - - if (Config.logDirtBlock) LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT)); - - LOGGER.info(Config.magicNumberIntroduction + Config.magicNumber); - - Config.items.forEach((item) -> LOGGER.info("ITEM >> {}", item.toString())); - } - - // 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"); - } - - // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent - @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, 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()); - } - } -} From bd7e38ad824fd4094519c6d9bbbc35de713b5aad Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 26 May 2025 20:28:46 +0100 Subject: [PATCH 3/7] WIP: Created proxy. --- .../GeologistPickTweaks.java | 2 + .../geologistpicktweaks/proxy/IProxy.java | 11 ++ .../geologistpicktweaks/proxy/Proxy.java | 103 ++++++++++++++++++ 3 files changed, 116 insertions(+) create mode 100644 src/main/java/dev/micle/geologistpicktweaks/proxy/IProxy.java create mode 100644 src/main/java/dev/micle/geologistpicktweaks/proxy/Proxy.java diff --git a/src/main/java/dev/micle/geologistpicktweaks/GeologistPickTweaks.java b/src/main/java/dev/micle/geologistpicktweaks/GeologistPickTweaks.java index c53bba7..9b10be9 100644 --- a/src/main/java/dev/micle/geologistpicktweaks/GeologistPickTweaks.java +++ b/src/main/java/dev/micle/geologistpicktweaks/GeologistPickTweaks.java @@ -1,6 +1,8 @@ package dev.micle.geologistpicktweaks; import com.mojang.logging.LogUtils; +import dev.micle.geologistpicktweaks.proxy.IProxy; +import dev.micle.geologistpicktweaks.proxy.Proxy; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; diff --git a/src/main/java/dev/micle/geologistpicktweaks/proxy/IProxy.java b/src/main/java/dev/micle/geologistpicktweaks/proxy/IProxy.java new file mode 100644 index 0000000..8282e1b --- /dev/null +++ b/src/main/java/dev/micle/geologistpicktweaks/proxy/IProxy.java @@ -0,0 +1,11 @@ +package dev.micle.geologistpicktweaks.proxy; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; + +public interface IProxy { + MinecraftServer getServer(); + Player getClientPlayer(); + Level getClientLevel(); +} diff --git a/src/main/java/dev/micle/geologistpicktweaks/proxy/Proxy.java b/src/main/java/dev/micle/geologistpicktweaks/proxy/Proxy.java new file mode 100644 index 0000000..425a6fb --- /dev/null +++ b/src/main/java/dev/micle/geologistpicktweaks/proxy/Proxy.java @@ -0,0 +1,103 @@ +package dev.micle.geologistpicktweaks.proxy; + +import dev.micle.geologistpicktweaks.GeologistPickTweaks; +import net.minecraft.client.Minecraft; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.AddReloadListenerEvent; +import net.minecraftforge.event.server.ServerStartedEvent; +import net.minecraftforge.event.server.ServerStoppingEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.event.lifecycle.*; + +public class Proxy implements IProxy { + private static MinecraftServer server = null; + + // Common setup + public Proxy() { + Config.register(); + + // Register mod event bus listeners + IEventBus modEventBus = GeologistPickTweaks.getFMLJavaModLoadingContext().getModEventBus(); + modEventBus.addListener(Proxy::setup); + modEventBus.addListener(Proxy::imcEnqueue); + modEventBus.addListener(Proxy::imcProcess); + + // Register event bus listeners + MinecraftForge.EVENT_BUS.addListener(Proxy::onAddReloadListeners); + MinecraftForge.EVENT_BUS.addListener(Proxy::serverStarted); + MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping); + } + + private static void setup(FMLCommonSetupEvent event) {} + + private static void imcEnqueue(InterModEnqueueEvent event) {} + + private static void imcProcess(InterModProcessEvent event) {} + + private static void onAddReloadListeners(AddReloadListenerEvent event) {} + + private static void serverStarted(ServerStartedEvent event) { + server = event.getServer(); + } + + private static void serverStopping(ServerStoppingEvent event) { + server = null; + } + + @Override + public MinecraftServer getServer() { + return server; + } + + @Override + public Player getClientPlayer() { + return null; + } + + @Override + public Level getClientLevel() { + return null; + } + + // Client setup + public static class Client extends Proxy { + public Client() { + // Register mod event bus listeners + IEventBus modEventBus = GeologistPickTweaks.getFMLJavaModLoadingContext().getModEventBus(); + modEventBus.addListener(Client::setup); + modEventBus.addListener(Client::postSetup); + } + + private static void setup(FMLClientSetupEvent event) {} + + private static void postSetup(FMLLoadCompleteEvent event) {} + + @Override + @OnlyIn(Dist.CLIENT) + public Player getClientPlayer() { + return Minecraft.getInstance().player; + } + + @Override + @OnlyIn(Dist.CLIENT) + public Level getClientLevel() { + return Minecraft.getInstance().level; + } + } + + // Server setup + public static class Server extends Proxy { + public Server() { + // Register mod event bus listeners + IEventBus modEventBus = GeologistPickTweaks.getFMLJavaModLoadingContext().getModEventBus(); + modEventBus.addListener(Server::setup); + } + + private static void setup(FMLDedicatedServerSetupEvent event) {} + } +} From 31f292c08113b2d8f3441f1f0f7c0017e101d79e Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 26 May 2025 20:31:15 +0100 Subject: [PATCH 4/7] Updated config. --- .../dev/micle/geologistpicktweaks/Config.java | 51 -------------- .../geologistpicktweaks/config/Config.java | 68 +++++++++++++++++++ .../geologistpicktweaks/proxy/Proxy.java | 1 + 3 files changed, 69 insertions(+), 51 deletions(-) delete mode 100644 src/main/java/dev/micle/geologistpicktweaks/Config.java create mode 100644 src/main/java/dev/micle/geologistpicktweaks/config/Config.java diff --git a/src/main/java/dev/micle/geologistpicktweaks/Config.java b/src/main/java/dev/micle/geologistpicktweaks/Config.java deleted file mode 100644 index 3538a2b..0000000 --- a/src/main/java/dev/micle/geologistpicktweaks/Config.java +++ /dev/null @@ -1,51 +0,0 @@ -package dev.micle.geologistpicktweaks; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.config.ModConfigEvent; -import net.minecraftforge.registries.ForgeRegistries; - -import java.util.Collections; -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 = Geologistpicktweaks.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/dev/micle/geologistpicktweaks/config/Config.java b/src/main/java/dev/micle/geologistpicktweaks/config/Config.java new file mode 100644 index 0000000..cd0c56e --- /dev/null +++ b/src/main/java/dev/micle/geologistpicktweaks/config/Config.java @@ -0,0 +1,68 @@ +package dev.micle.geologistpicktweaks.config; + +import dev.micle.geologistpicktweaks.GeologistPickTweaks; +import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.config.ModConfigEvent; +import org.apache.commons.lang3.tuple.Pair; + +@Mod.EventBusSubscriber(modid = GeologistPickTweaks.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public final class Config { + public static final Client CLIENT; + public static final ForgeConfigSpec CLIENT_SPEC; + public static final Common COMMON; + public static final ForgeConfigSpec COMMON_SPEC; + public static final Server SERVER; + public static final ForgeConfigSpec SERVER_SPEC; + + static { + Pair clientSpecPair = new ForgeConfigSpec.Builder().configure(Client::new); + CLIENT = clientSpecPair.getLeft(); + CLIENT_SPEC = clientSpecPair.getRight(); + + Pair commonSpecPair = new ForgeConfigSpec.Builder().configure(Common::new); + COMMON = commonSpecPair.getLeft(); + COMMON_SPEC = commonSpecPair.getRight(); + + Pair serverSpecPair = new ForgeConfigSpec.Builder().configure(Server::new); + SERVER = serverSpecPair.getLeft(); + SERVER_SPEC = serverSpecPair.getRight(); + } + + public static void register() { + GeologistPickTweaks.getFMLJavaModLoadingContext().registerConfig(ModConfig.Type.CLIENT, CLIENT_SPEC); + GeologistPickTweaks.getFMLJavaModLoadingContext().registerConfig(ModConfig.Type.COMMON, COMMON_SPEC); + GeologistPickTweaks.getFMLJavaModLoadingContext().registerConfig(ModConfig.Type.SERVER, SERVER_SPEC); + } + + @SubscribeEvent + public static void onConfigReloadEvent(ModConfigEvent event) { + if (event.getConfig().getSpec() == CLIENT_SPEC) { + Client.onConfigReload(); + } else if (event.getConfig().getSpec() == COMMON_SPEC) { + Common.onConfigReload(); + } else if (event.getConfig().getSpec() == SERVER_SPEC) { + Server.onConfigReload(); + } + } + + public static class Client { + Client(ForgeConfigSpec.Builder builder) {} + + private static void onConfigReload() {} + } + + public static class Common { + Common(ForgeConfigSpec.Builder builder) {} + + private static void onConfigReload() {} + } + + public static class Server { + Server(ForgeConfigSpec.Builder builder) {} + + private static void onConfigReload() {} + } +} diff --git a/src/main/java/dev/micle/geologistpicktweaks/proxy/Proxy.java b/src/main/java/dev/micle/geologistpicktweaks/proxy/Proxy.java index 425a6fb..43f2669 100644 --- a/src/main/java/dev/micle/geologistpicktweaks/proxy/Proxy.java +++ b/src/main/java/dev/micle/geologistpicktweaks/proxy/Proxy.java @@ -1,6 +1,7 @@ package dev.micle.geologistpicktweaks.proxy; import dev.micle.geologistpicktweaks.GeologistPickTweaks; +import dev.micle.geologistpicktweaks.config.Config; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; From 30024faf89d24e98dbcb5add7ce5644c09332974 Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 26 May 2025 20:49:18 +0100 Subject: [PATCH 5/7] Added mixin support. Updated gitignore. --- .gitignore | 1 + build.gradle | 20 +++++++++++++++++++ .../geologist_pick_tweaks.mixins.json | 14 +++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 src/main/resources/geologist_pick_tweaks.mixins.json diff --git a/.gitignore b/.gitignore index f26a2bb..f3d7e9e 100644 --- a/.gitignore +++ b/.gitignore @@ -191,6 +191,7 @@ fabric.properties ### ForgeGradle template # Minecraft client/server files run/ +run-data/ ### Gradle template .gradle diff --git a/build.gradle b/build.gradle index 9441636..7118c10 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,14 @@ +buildscript { + repositories { + // These repositories are only for Gradle plugins, put any other repositories in the repository block further below + maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } + mavenCentral() + } + dependencies { + classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' + } +} + plugins { id 'eclipse' id 'idea' @@ -5,6 +16,8 @@ plugins { id 'org.parchmentmc.librarian.forgegradle' version '1.+' } +apply plugin: 'org.spongepowered.mixin' + group = mod_group_id version = mod_version @@ -58,6 +71,12 @@ minecraft { } } +mixin { + add sourceSets.main, "${mod_id}.refmap.json" + + config "${mod_id}.mixins.json" +} + sourceSets.main.resources { srcDir 'src/generated/resources' } @@ -66,6 +85,7 @@ repositories {} dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' } tasks.named('processResources', ProcessResources).configure { diff --git a/src/main/resources/geologist_pick_tweaks.mixins.json b/src/main/resources/geologist_pick_tweaks.mixins.json new file mode 100644 index 0000000..0fa4051 --- /dev/null +++ b/src/main/resources/geologist_pick_tweaks.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "dev.micle.geologistpicktweaks.mixin", + "compatibilityLevel": "JAVA_8", + "refmap": "test.refmap.json", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} From 56553e0fbe14043642b8ab2c586f440cd7a18298 Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 26 May 2025 20:51:26 +0100 Subject: [PATCH 6/7] Added Immersive Engineering and Immersive Geology. --- build.gradle | 17 ++++++++++++++++- gradle.properties | 4 ++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7118c10..a696e73 100644 --- a/build.gradle +++ b/build.gradle @@ -81,10 +81,25 @@ sourceSets.main.resources { srcDir 'src/generated/resources' } -repositories {} +repositories { + exclusiveContent { + forRepository { + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + } + } + forRepositories(fg.repository) // Only add this if you're using ForgeGradle, otherwise remove this line + filter { + includeGroup "maven.modrinth" + } + } +} dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + implementation fg.deobf("maven.modrinth:immersiveengineering:${immersiveengineering_version}") + implementation fg.deobf("maven.modrinth:immersive-geology:${immersive_geology_version}") annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' } diff --git a/gradle.properties b/gradle.properties index 25eeb3e..b0cd4a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,9 @@ forge_version=47.4.0 forge_version_range=[47,) loader_version_range=[47,) +immersiveengineering_version=10.2.0-183 + +immersive_geology_version=0.6.13-b66 + mapping_channel=parchment mapping_version=2023.09.03 From d5b6f88693090c9c801f28e7f3d70cc3d5771e8a Mon Sep 17 00:00:00 2001 From: Micle Date: Mon, 26 May 2025 21:05:44 +0100 Subject: [PATCH 7/7] Added IE and IG as dependencies. --- build.gradle | 4 +++- src/main/resources/META-INF/mods.toml | 14 ++++++++++++++ .../resources/geologist_pick_tweaks.mixins.json | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a696e73..48edc71 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,9 @@ tasks.named('processResources', ProcessResources).configure { forge_version : forge_version, forge_version_range: forge_version_range, loader_version_range: loader_version_range, mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, - mod_authors : mod_authors, mod_description: mod_description,] + mod_authors : mod_authors, mod_description: mod_description, + immersiveengineering_version: immersiveengineering_version, + immersive_geology_version: immersive_geology_version] inputs.properties replaceProperties diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 6d133b3..576960a 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -28,3 +28,17 @@ mandatory = true versionRange = "${minecraft_version_range}" ordering = "NONE" side = "BOTH" + +[[dependencies."${mod_id}"]] +modId = "immersiveengineering" +mandatory = true +versionRange = "[${minecraft_version}-${immersiveengineering_version},]" +ordering = "NONE" +side = "BOTH" + +[[dependencies."${mod_id}"]] +modId = "immersivegeology" +mandatory = true +versionRange = "[${immersive_geology_version},]" +ordering = "NONE" +side = "BOTH" diff --git a/src/main/resources/geologist_pick_tweaks.mixins.json b/src/main/resources/geologist_pick_tweaks.mixins.json index 0fa4051..12208a1 100644 --- a/src/main/resources/geologist_pick_tweaks.mixins.json +++ b/src/main/resources/geologist_pick_tweaks.mixins.json @@ -3,7 +3,7 @@ "minVersion": "0.8", "package": "dev.micle.geologistpicktweaks.mixin", "compatibilityLevel": "JAVA_8", - "refmap": "test.refmap.json", + "refmap": "geologist_pick_tweaks.refmap.json", "mixins": [ ], "client": [