Skip to content

Commit

Permalink
Cleanup gradle and various dev files combined with bumping version
Browse files Browse the repository at this point in the history
  • Loading branch information
Dragon-Seeker committed Sep 24, 2024
1 parent f9b4db9 commit 3b59acf
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 33 deletions.
23 changes: 7 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ allprojects {
publications {
mavenJava(MavenPublication) {
from components.java

artifactId = project.archivesBaseName
}
}

Expand Down Expand Up @@ -149,37 +151,26 @@ loom {
accessWidenerPath = file("src/main/resources/owo.accesswidener")

neoForge {
// convertAccessWideners = true
// extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
// TODO: Figure out within the future
// publish file("src/main/resources/interfaces.json")
// publish file("src/main/resources/META-INF/owo.accesstransformer.cfg")
}
}

//remapJar {
// dependsOn(processResources)
// atAccessWideners.add("owo_fun.accesswidener")
//}

dependencies {
// modLocalRuntime("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}")
//modLocalRuntime("me.shedaniel:RoughlyEnoughItems-neoforge:${project.rei_version}")
modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:${project.rei_version}")
modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-neoforge:${project.rei_version}")

modCompileOnly("dev.emi:emi-neoforge:${project.emi_version}")
// modLocalRuntime("dev.emi:emi-fabric:${project.emi_version}")

// modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
// modLocalRuntime("com.terraformersmc:modmenu:${project.modmenu_version}")

forgeRuntimeLibrary(include(api("io.wispforest:endec:0.1.5")))
forgeRuntimeLibrary(include(api("io.wispforest.endec:netty:0.1.2")))
forgeRuntimeLibrary(include(api("io.wispforest.endec:gson:0.1.3")))
forgeRuntimeLibrary(include(api("io.wispforest.endec:jankson:0.1.3")))

include api(forgeRuntimeLibrary("blue.endless:jankson:${project.jankson_version}"))

// modCompileOnly("xyz.nucleoid:server-translations-api:${project.stapi_version}")
forgeRuntimeLibrary(include(api("blue.endless:jankson:${project.jankson_version}")))

//
include("org.sinytra:forgified-fabric-loader:2.5.29+0.16.0+1.21:full")
api("org.sinytra:forgified-fabric-loader:2.5.29+0.16.0+1.21")

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ minecraft_version=1.21.1
yarn_mappings=1.21+build.2
loader_version=0.15.11
# Mod Properties
mod_version=0.12.14
mod_version=0.12.14-beta.1
maven_group=io.wispforest
archives_base_name=owo-lib-neo
archives_base_name=owo-lib-neoforge

neoforge_version=21.1.47
# Dependencies
Expand Down
5 changes: 1 addition & 4 deletions src/main/resources/META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@ yes its bad i know thanks
logoFile = "assets/owo/icon.png"

[[accessTransformers]]
file="META-INF/accesstransformer_owo.cfg"
file="META-INF/owo.accesstransformer.cfg"

[[mixins]]
config = 'owo.mixins.json'

[[mixins]]
config = 'owo-forge.mixins.json'

[[dependencies.owo]]
modId = "neoforge"
required = true
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/architectury.common.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"accessWidener": "owo.accesswidener",
"injected_interfaces": {
"net/minecraft/class_2487": [
"io/wispforest/endec/util/MapCarrier"
Expand Down
29 changes: 29 additions & 0 deletions src/main/resources/interfaces.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"net/minecraft/nbt/CompoundTag": [
"io/wispforest/endec/util/MapCarrier"
],
"net/minecraft/network/FriendlyByteBuf": [
"io/wispforest/endec/util/EndecBuffer"
],
"net/minecraft/client/gui/components/AbstractWidget": [
"io/wispforest/owo/ui/inject/ComponentStub"
],
"net/minecraft/client/gui/components/EditBox": [
"io/wispforest/owo/ui/inject/GreedyInputComponent"
],
"net/minecraft/world/inventory/AbstractContainerMenu": [
"io/wispforest/owo/client/screens/OwoScreenHandler"
],
"net/minecraft/client/gui/GuiGraphics": [
"io/wispforest/owo/ui/util/MatrixStackTransformer"
],
"net/minecraft/core/component/DataComponentType\u0024Builder": [
"io/wispforest/owo/serialization/OwoComponentTypeBuilder<T;>"
],
"net/minecraft/world/item/Item\u0024Properties": [
"io/wispforest/owo/itemgroup/OwoItemSettingsExtension"
],
"net/minecraft/world/item/Item": [
"io/wispforest/owo/ext/OwoItem"
]
}
10 changes: 0 additions & 10 deletions src/main/resources/owo-forge.mixins.json

This file was deleted.

0 comments on commit 3b59acf

Please sign in to comment.