Skip to content

Commit eb834dd

Browse files
MrNavaStarMrNavaStar
committed
I think neoforge works
1 parent fd230c7 commit eb834dd

File tree

4 files changed

+18
-57
lines changed

4 files changed

+18
-57
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
sed -i 's/debug-build/${{ github.event.release.tag_name }}/g' common/src/main/java/me/mrnavastar/protoweaver/core/util/ProtoConstants.java
2020
sed -i 's/debug-build/${{ github.event.release.tag_name }}/g' fabric/src/main/resources/fabric.mod.json
2121
sed -i 's/0.debug-build/${{ github.event.release.tag_name }}/g' forge/src/main/resources/META-INF/mods.toml
22+
sed -i 's/0.debug-build/${{ github.event.release.tag_name }}/g' neoforge/src/main/resources/META-INF/neoforge.mods.toml
2223
sed -i 's/debug-build/${{ github.event.release.tag_name }}/g' paper/src/main/resources/plugin.yml
2324
sed -i 's/debug-build/${{ github.event.release.tag_name }}/g' proxy/src/main/resources/bungee.yml
2425
@@ -54,7 +55,7 @@ jobs:
5455
game-versions: |
5556
>=1.15
5657
57-
- name: Upload Forge
58+
- name: Upload NeoForge
5859
uses: Kir-Antipov/mc-publish@v3.3.0
5960
with:
6061
modrinth-id: 6nKmUVc7

‎forge/src/main/resources/META-INF/mods.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ issueTrackerURL="https://github.com/MrNavaStar/ProtoWeaver/issues"
77
modId = "protoweaver"
88
version = "0.debug-build"
99
displayName = "ProtoWeaver"
10+
logoFile = "assets/protoweaver/icon.png"
1011
displayURL="https://github.com/MrNavaStar/ProtoWeaver"
1112
authors="MrNavaStar"
1213
description = "A networking library for creating custom protocols that run on the internal netty server."

‎neoforge/build.gradle‎

Lines changed: 9 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,10 @@
11
plugins {
2-
id 'java-library'
32
id 'net.neoforged.moddev' version '2.0.95'
43
}
54

6-
/*tasks.named('wrapper', Wrapper).configure {
7-
// Define wrapper values here so as to not have to always do so when updating gradlew.properties.
8-
// Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with
9-
// documentation attached on cursor hover of gradle classes and methods. However, this comes with increased
10-
// file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards.
11-
// (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`)
12-
distributionType = Wrapper.DistributionType.BIN
13-
}*/
14-
155
neoForge {
16-
// Specify the version of NeoForge to use.
176
version = project.neoforge_version
187

19-
// This line is optional. Access Transformers are automatically detected
20-
// accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')
21-
22-
// Default run configurations.
23-
// These can be tweaked, removed, or duplicated as needed.
248
runs {
259
server {
2610
server()
@@ -32,55 +16,26 @@ neoForge {
3216
logLevel = org.slf4j.event.Level.DEBUG
3317
}
3418
}
35-
36-
/* mods {
37-
// define mod <-> source bindings
38-
// these are used to tell the game which sources are for which mod
39-
// multi mod projects should define one per mod
40-
"${mod_id}" {
41-
sourceSet(sourceSets.main)
42-
}
43-
}*/
4419
}
4520

46-
// Include resources generated by data generators.
47-
sourceSets.main.resources { srcDir 'src/generated/resources' }
48-
49-
// Sets up a dependency configuration called 'localRuntime'.
50-
// This configuration should be used instead of 'runtimeOnly' to declare
51-
// a dependency that will be present for runtime testing but that is
52-
// "optional", meaning it will not be pulled by dependents of this mod.
5321
configurations {
54-
runtimeClasspath.extendsFrom localRuntime
5522
zip.exclude group: "net.fabricmc", module: "fabric-loader"
5623
}
5724

5825
dependencies {
5926
zip compileOnly(project(path: ':loader-common', configuration: 'default'))
6027

61-
// Example optional mod dependency with JEI
62-
// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
63-
// compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
64-
// compileOnly "mezz.jei:jei-${mc_version}-neoforge-api:${jei_version}"
65-
// We add the full version to localRuntime, not runtimeOnly, so that we do not publish a dependency on it
66-
// localRuntime "mezz.jei:jei-${mc_version}-neoforge:${jei_version}"
28+
// Libs
29+
jarJar implementation("org.apache.fury:fury-core:${project.fury_version}")
30+
jarJar implementation("org.bouncycastle:bcpkix-jdk18on:${project.bouncy_version}")
31+
jarJar implementation("org.bouncycastle:bcprov-jdk18on:${project.bouncy_version}")
32+
jarJar implementation("org.bouncycastle:bcutil-jdk18on:${project.bouncy_version}")
33+
jarJar implementation("io.netty:netty-codec-http:${project.netty_version}")
34+
jarJar implementation("io.netty:netty-codec-http2:${project.netty_version}")
35+
jarJar implementation("me.mrnavastar:r:${project.r_version}")
6736

37+
// Mod Compat
6838
compileOnly "maven.modrinth:proxy-compatible-forge:${project.proxy_forge_version}"
69-
70-
// Example mod dependency using a mod jar from ./libs with a flat dir repository
71-
// This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
72-
// The group id is ignored when searching -- in this case, it is "blank"
73-
// implementation "blank:coolmod-${mc_version}:${coolmod_version}"
74-
75-
// Example mod dependency using a file as dependency
76-
// implementation files("libs/coolmod-${mc_version}-${coolmod_version}.jar")
77-
78-
// Example project dependency using a sister or child project:
79-
// implementation project(":myproject")
80-
81-
// For more info:
82-
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
83-
// http://www.gradle.org/docs/current/userguide/dependency_management.html
8439
}
8540

8641
jar {

neoforge/src/main/resources/META-INF/mods.toml renamed to neoforge/src/main/resources/META-INF/neoforge.mods.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
modLoader = "javafml"
2-
loaderVersion = "[26,)"
2+
loaderVersion = "[1,)"
33
license = "CC0-1.0"
44
issueTrackerURL="https://github.com/MrNavaStar/ProtoWeaver/issues"
55

66
[[mods]]
77
modId = "protoweaver"
88
version = "0.debug-build"
99
displayName = "ProtoWeaver"
10+
logoFile = "assets/protoweaver/icon.png"
1011
displayURL="https://github.com/MrNavaStar/ProtoWeaver"
1112
authors="MrNavaStar"
1213
description = "A networking library for creating custom protocols that run on the internal netty server."
1314

14-
displayTest="IGNORE_ALL_VERSION"
15+
displayTest="IGNORE_ALL_VERSION"
16+
17+
[[mixins]]
18+
config="protoweaver.mixins.json"

0 commit comments

Comments
 (0)