Skip to content

Commit

Permalink
Fixed maven publish and test item
Browse files Browse the repository at this point in the history
  • Loading branch information
UnRealDinnerbone committed Jan 1, 2024
1 parent d289559 commit 613dca6
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 54 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
### 4.0.0
### 4.0.1

- Updated to 1.20.4
- Fixed Maven Publishing
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ subprojects {

sourceSets.main.resources.srcDir project.file('src/generated/resources')

java.toolchain.languageVersion = JavaLanguageVersion.of(17)


base {
archivesName = "${project.property("mod_name")}-${project.name}".toLowerCase()
}
Expand Down Expand Up @@ -66,7 +69,7 @@ subprojects {
}
}
publications {
mavenJava(MavenPublication) {
register("mavenJava", MavenPublication) {
groupId project.group
artifactId project.getArchivesBaseName()
}
Expand Down

This file was deleted.

17 changes: 1 addition & 16 deletions forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,4 @@ multiLoader.forge() {
forgeVersion.set("${forge_version}")
}

jarJar.enable()

publishing {
publications {
mavenJava(MavenPublication) {
from components.java
fg.component(it)
}
}
}

tasks.jarJar {
finalizedBy("reobfJarJar")
setArchivesBaseName("${project.property("mod_name")}-${project.name}".toLowerCase())

}
publishing.publications.mavenJava.artifact jar
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Project
mod_version=4.0.0
mod_version=4.0.1
maven_group=com.unrealdinnerbone
mod_name=Trenzalore
mod_author=UnRealDinnerbone
Expand Down
4 changes: 1 addition & 3 deletions neo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ multiLoader.neo() {
neoVersion.set("${neo_version}")
}



java.toolchain.languageVersion = JavaLanguageVersion.of(17)
publishing.publications.mavenJava.from components.java

Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package com.unrealdinnerbone.trenzalore;

import com.unrealdinnerbone.trenzalore.platform.NeoPlatformHelper;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.event.IModBusEvent;
import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;

@Mod(Trenzalore.MOD_ID)
public class TrenzaloreForge {

public TrenzaloreForge() {
public TrenzaloreForge(IEventBus modEventBus) {
Trenzalore.init();
FMLJavaModLoadingContext.get().getModEventBus().addListener(TrenzaloreForge::onCreativeTab);
modEventBus.addListener(TrenzaloreForge::onCreativeTab);
}

public static void onCreativeTab(BuildCreativeModeTabContentsEvent event) {
Expand Down
4 changes: 2 additions & 2 deletions neo/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ authors="UnRealDinnerbone"
description="This mod adds a few small helpers to provide compatibility with Forge / Fabric."
[[dependencies.trenzalore]]
modId="neoforge"
mandatory=true
required=true
versionRange="[1.0,)"
ordering="NONE"
side="BOTH"
[[dependencies.trenzalore]]
modId="minecraft"
mandatory=true
required=true
versionRange="[${minecraft_version}]"
ordering="NONE"
side="BOTH"
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
com.unrealdinnerbone.trenzalore.TrenzaloreNeoRegistry
com.unrealdinnerbone.trenzalore.TestItems

0 comments on commit 613dca6

Please sign in to comment.