Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .deps/BloodMagic-1.21.1
Submodule BloodMagic-1.21.1 added at 27d76b
141 changes: 38 additions & 103 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@ plugins {
id 'idea'
id 'java-library'
id 'maven-publish'
id 'net.neoforged.moddev.legacyforge' version '2.0.91'
id 'net.neoforged.moddev' version '2.0.91'
}

tasks.named('wrapper', Wrapper).configure {
// Define wrapper values here so as to not have to always do so when updating gradlew.properties.
// Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with
// documentation attached on cursor hover of gradle classes and methods. However, this comes with increased
// file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards.
// (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`)
distributionType = Wrapper.DistributionType.BIN
}

Expand All @@ -21,96 +16,56 @@ base {
archivesName = mod_id
}

// Mojang ships Java 17 to end users in 1.20.1, so mods should target Java 17.
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
java.toolchain.languageVersion = JavaLanguageVersion.of(21)

legacyForge {
// Specify the version of MinecraftForge to use.
version = project.minecraft_version + '-' + project.forge_version
neoForge {
version = project.neo_version

parchment {
mappingsVersion = project.parchment_mappings_version
minecraftVersion = project.parchment_minecraft_version
}

// This line is optional. Access Transformers are automatically detected
// accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')

// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
runs {
client {
client()

// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
}

server {
server()
programArgument '--nogui'
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
}

// 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 {
type = "gameTestServer"
systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
}

data {
data()

// example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
// gameDirectory = project.file('run-data')

// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
}

// applies to all the run configs above
configureEach {
// 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.
systemProperty '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
systemProperty 'neoforge.logging.markers', 'REGISTRIES'
logLevel = org.slf4j.event.Level.DEBUG
}
}

mods {
// define mod <-> source bindings
// these are used to tell the game which sources are for which mod
// mostly optional in a single mod project
// but multi mod projects should define one per mod
"${mod_id}" {
sourceSet(sourceSets.main)
}
}
}

// Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/generated/resources' }

// Sets up a dependency configuration called 'localRuntime' and a deobfuscating one called 'modLocalRuntime'
// These configurations should be used instead of 'runtimeOnly' to declare
// a dependency that will be present for runtime testing but that is
// "optional", meaning it will not be pulled by dependents of this mod.
configurations {
runtimeClasspath.extendsFrom localRuntime
}
obfuscation {
createRemappingConfiguration(configurations.localRuntime)
}


repositories {
mavenLocal()
Expand All @@ -136,18 +91,18 @@ repositories {
maven {
name = "BlameJared"
url = "https://maven.blamejared.com"
content {
includeGroup "vazkii.patchouli"
}
}

maven {
name = "BlameJared"
url = "https://maven.blamejared.com"
name = "Modrinth"
url = "https://api.modrinth.com/maven"
content {
includeGroup "maven.modrinth"
}
}

maven {
name = "TheIllusiveC4"
name = "Curios"
url = "https://maven.theillusivec4.top/"
content {
includeGroup "top.theillusivec4.curios"
Expand All @@ -156,31 +111,16 @@ repositories {
}

dependencies {
// Blood Magic
modImplementation "curse.maven:blood-magic-224791:7956981"
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
modCompileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
modCompileOnly "mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}"

modLocalRuntime "mezz.jei:jei-${minecraft_version}-forge:${jei_version}"

modImplementation "appeng:appliedenergistics2-forge:15.4.10"
modLocalRuntime "org.appliedenergistics:guideme:20.1.7"

// Blood Magic runtime dependency
modLocalRuntime "vazkii.patchouli:Patchouli:1.20.1-80-FORGE"

// Опционально, но удобно для dev-сборки с Blood Magic
modLocalRuntime "top.theillusivec4.curios:curios-forge:5.3.4+1.20.1"
}
compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
localRuntime "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"

mixin {
add sourceSets.main, "${mod_id}.refmap.json"
config "${mod_id}.mixins.json"
}
implementation "org.appliedenergistics:appliedenergistics2:${ae2_version}"
localRuntime "org.appliedenergistics:guideme:${guideme_version}"

dependencies {
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
implementation "com.example.examplemod:BloodMagic-1.21.1:${blood_magic_version}"
localRuntime "top.theillusivec4.curios:curios-neoforge:${curios_version}+${minecraft_version}"
localRuntime "maven.modrinth:jade:${jade_version}+neoforge"
}

jar {
Expand All @@ -189,35 +129,31 @@ jar {
])
}


// 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.
var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) {
var replaceProperties = [
minecraft_version : minecraft_version,
minecraft_version_range : minecraft_version_range,
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
minecraft_version : minecraft_version,
minecraft_version_range : minecraft_version_range,
neo_version : neo_version,
neo_version_range : neo_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,
ae2_version : ae2_version,
blood_magic_version_range: blood_magic_version_range
]
inputs.properties replaceProperties
expand replaceProperties
from "src/main/templates"
into "build/generated/sources/modMetadata"
}
// Include the output of "generateModMetadata" as an input directory for the build
// this works with both building through Gradle and the IDE.

sourceSets.main.resources.srcDir generateModMetadata
// To avoid having to run "generateModMetadata" manually, make it run on every project reload
legacyForge.ideSyncTask generateModMetadata
neoForge.ideSyncTask generateModMetadata

// Example configuration to allow publishing using the maven-publish plugin
publishing {
publications {
register('mavenJava', MavenPublication) {
Expand All @@ -232,10 +168,9 @@ publishing {
}

tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
options.encoding = 'UTF-8'
}

// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
idea {
module {
downloadSources = true
Expand Down
51 changes: 18 additions & 33 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,46 +1,31 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
org.gradle.jvmargs=-Xmx1G
org.gradle.jvmargs=-Xmx2G
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=true

#read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment
# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
parchment_minecraft_version=1.20.1
parchment_mappings_version=2023.09.03
# Environment Properties
jei_version=15.20.0.127
# You can find the latest versions here: https://files.minecraftforge.net/net/minecraftforge/forge/index_1.20.1.html
# 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.1.3
# The Forge version range can use any version of Forge as bounds
forge_version_range=[47.1.3,)
# The loader version range can only use the major version of FML as bounds
loader_version_range=[47,)
parchment_minecraft_version=1.21.1
parchment_mappings_version=2024.11.17

## Mod Properties
minecraft_version=1.21.1
minecraft_version_range=[1.21.1,1.22)
neo_version=21.1.172
neo_version_range=[21.1.0,)
loader_version_range=[4,)

jei_version=19.25.1.332
ae2_version=19.2.17
guideme_version=21.1.13

blood_magic_version=3.4.0-46-alpha
blood_magic_version_range=[3.4.0,)
curios_version=9.4.2
jade_version=15.10.0

# 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=bmaddon
# The human-readable display name for the mod.
mod_name=BloodMagic Additions
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=GNU GPLv3
# The mod version. See https://semver.org/
mod_version=1.0.2
# 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_version=1.1.0
mod_group_id=com.edgemq.bmaddon
# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
mod_authors=edgemq
# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
mod_description=BloodMagic Additions
3 changes: 3 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
}
19 changes: 8 additions & 11 deletions src/main/java/com/edgemq/bmaddon/BMAddon.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,29 @@
import com.edgemq.bmaddon.registry.BMAddonItems;
import com.edgemq.bmaddon.registry.BMAddonMenus;
import com.edgemq.bmaddon.registry.BMAddonSlotSemantics;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.ModContainer;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.config.ModConfig;

@Mod(BMAddon.MODID)
public class BMAddon {
public static final String MODID = "bmaddon";

public BMAddon() {
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();

public BMAddon(IEventBus modEventBus, ModContainer modContainer) {
BMAddonSlotSemantics.init();

BMAddonBlocks.register(modEventBus);
BMAddonItems.register(modEventBus);
BMAddonBlockEntities.register(modEventBus);
BMAddonMenus.register(modEventBus);

BMAddonNetwork.register();
modEventBus.addListener(BMAddonNetwork::register);

ModLoadingContext.get().registerConfig(
modContainer.registerConfig(
ModConfig.Type.COMMON,
BMAddonCommonConfig.SPEC,
BMAddon.MODID + "-common.toml"
);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ public IPatternDetails decodePattern(AEItemKey what, Level level) {

ItemStack stack = what.toStack();

return decodePattern(stack, level, false);
return decodePattern(stack, level);
}

@Nullable
@Override
public IPatternDetails decodePattern(ItemStack stack, Level level, boolean tryRecovery) {
public IPatternDetails decodePattern(ItemStack stack, Level level) {
if (!isEncodedPattern(stack)) {
return null;
}

return BloodAltarPatternDetails.create(level, stack).orElse(null);
}
}
}
Loading
Loading