Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Neoforge] Create 1.21 Neoforge Version of oωo (owo-lib) #283

Draft
wants to merge 69 commits into
base: 1.21
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
cdbf7c5
Initial Commit
Dragon-Seeker Jun 30, 2024
1ae4013
Fix networking
Dragon-Seeker Jul 3, 2024
6ae2767
Re enable OwoFreezer
Dragon-Seeker Jul 3, 2024
d1cd598
[endec] fix "hilarious" typo which causes asymmetric serialization in…
gliscowo Jun 30, 2024
0012112
Add fun aw
Dragon-Seeker Jul 5, 2024
589cf91
Fix incorrect mod id within toml for dependencies
Dragon-Seeker Jul 5, 2024
3680fbe
Adjust archive name
Dragon-Seeker Jul 5, 2024
2999d35
Push fix for uwu config UI model
Dragon-Seeker Jul 5, 2024
9509a67
Use Latest endec version
Dragon-Seeker Jul 5, 2024
ddae897
Fix register event hook for item groups
Dragon-Seeker Jul 5, 2024
cd8c85e
Merge branch '1.21' into 1.21-Neo
Dragon-Seeker Jul 5, 2024
b5be637
Add AT from AW and remove converting AW file
Dragon-Seeker Jul 7, 2024
c13cb50
Adjust ItemGroup API for Suppliers
Dragon-Seeker Jul 7, 2024
c4964a3
i mald so hard
BasiqueEvangelist Jul 9, 2024
9dee815
Merge pull request #1 from BasiqueEvangelist/neo-remove-rich-translat…
Dragon-Seeker Jul 9, 2024
c8c99de
Adjust Item Group Behavior to be supplied based
Dragon-Seeker Jul 10, 2024
4bfb435
Update Arch loom to try and fix latest mixin issues with neo
Dragon-Seeker Jul 10, 2024
106136b
use newer ffapi and remove extras
BasiqueEvangelist Jul 21, 2024
d930e82
reset ReiUIAdapter to vanilla owo
BasiqueEvangelist Jul 21, 2024
bf18008
re-add uses of PacketByteBufs
BasiqueEvangelist Jul 21, 2024
a0c02dd
update some testmod code
BasiqueEvangelist Jul 21, 2024
f8aca8c
mfw indentation
BasiqueEvangelist Jul 21, 2024
fdb3a33
make more stuff conform to vanilla owo
BasiqueEvangelist Jul 21, 2024
f1a13c4
remove OwoModMenuPlugin
BasiqueEvangelist Jul 21, 2024
d5743ca
fix some weird code
BasiqueEvangelist Jul 21, 2024
7725cc7
fix item rendering? :thonk:
BasiqueEvangelist Jul 21, 2024
e83cb71
Merge pull request #2 from BasiqueEvangelist/1.21-Neo-modernization
Dragon-Seeker Jul 31, 2024
7977709
Merge branch '1.21' into 1.21-Neo
Dragon-Seeker Sep 9, 2024
860152a
Fix issues with missing interface injection and various item setting …
Dragon-Seeker Sep 9, 2024
6174e96
Fix issues with missing interface injection and various item setting …
Dragon-Seeker Sep 9, 2024
2ebe4ec
Fix incorrect registry add callback and fix issues with using wrong c…
Dragon-Seeker Sep 9, 2024
d87b740
Bump FFAPI and Neo version
Dragon-Seeker Sep 9, 2024
a7640b5
Merge branch '1.21-Neo' of https://github.com/Dragon-Seeker/owo-lib i…
Dragon-Seeker Sep 9, 2024
94afcc2
Fix various issues with port to neo
Dragon-Seeker Sep 10, 2024
aac272c
Merge branch '1.21' into 1.21-Neo
Dragon-Seeker Sep 17, 2024
f9b4db9
Fix import issues
Dragon-Seeker Sep 17, 2024
3b59acf
Cleanup gradle and various dev files combined with bumping version
Dragon-Seeker Sep 24, 2024
3a388e0
Fix setting up IConfigScreenFactory within main mod initializer inste…
Dragon-Seeker Sep 25, 2024
850173c
Bump Version 0.12.14-beta.2
Dragon-Seeker Sep 25, 2024
fe7a1bc
Update endec version due to issues with neo
Dragon-Seeker Sep 30, 2024
1da9de2
Bump version 0.12.14-beta.3
Dragon-Seeker Sep 30, 2024
0aa6690
Update AT to be in mojmap
Dragon-Seeker Oct 2, 2024
d2de308
Bump version 0.12.14-beta.4
Dragon-Seeker Oct 3, 2024
68a25c2
Merge branch '1.21' into 1.21-Neo
Dragon-Seeker Oct 3, 2024
30559f0
Update Dependency handling and require FFAPI instead of JIJ
Dragon-Seeker Oct 8, 2024
ff42a68
Merge branch '1.21' into 1.21-Neo
Dragon-Seeker Oct 8, 2024
e360c46
Adjust Dependency for FFAPI due to issues with other unused modules
Dragon-Seeker Oct 18, 2024
9a79886
Add provides field provide other alternative mod ids for owo
Dragon-Seeker Oct 20, 2024
15dacbf
Get AT fully working and publish both AT and Interface Injection file…
Dragon-Seeker Oct 20, 2024
85ca36d
Update code to use Accessor for addDrawableChild
Dragon-Seeker Oct 22, 2024
98ed024
Bump version 0.12.15-beta.5
Dragon-Seeker Oct 22, 2024
1decaa4
Add temp fix for concurrent modification issues with Neoforge networking
Dragon-Seeker Oct 23, 2024
69a4c54
Bump version 0.12.15-beta.5
Dragon-Seeker Oct 23, 2024
3cffcf7
Adjust publishing to use Neos moddev and pull in loom jars
Dragon-Seeker Oct 23, 2024
70eca53
Fix building issues
Dragon-Seeker Oct 24, 2024
6970c30
Bump beta 6
Dragon-Seeker Oct 24, 2024
8ae230f
Fix issues with depending on main fabric version of owo due to janky …
Dragon-Seeker Oct 30, 2024
600c1b6
Bump beta 7
Dragon-Seeker Oct 30, 2024
3eae710
Fix publishing issues once again as missing runtime stuff
Dragon-Seeker Nov 3, 2024
22da261
Prevent shader crashing from occurring when a modloading error has oc…
Dragon-Seeker Nov 3, 2024
8a26287
Bump beta 9
Dragon-Seeker Nov 3, 2024
1170268
Fix config screens only showing up within development enviroments
Dragon-Seeker Nov 13, 2024
9a32a2a
Bump beta 10
Dragon-Seeker Nov 13, 2024
de1ad49
Disable Ability to use Renderdoc
Dragon-Seeker Nov 20, 2024
13365a7
Disable Ability to use Renderdoc
Dragon-Seeker Nov 20, 2024
bcc057f
Merge branch '1.21-Neo' of https://github.com/Dragon-Seeker/owo-lib i…
Dragon-Seeker Nov 20, 2024
f659410
Bump beta 11
Dragon-Seeker Nov 20, 2024
6332fbb
Second part of disabling renderdoc code: disable "risky" `System.load…
Dragon-Seeker Nov 28, 2024
ce3967a
Bump beta 12
Dragon-Seeker Nov 29, 2024
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
Prev Previous commit
Next Next commit
Get AT fully working and publish both AT and Interface Injection file…
… for native moddev support
Dragon-Seeker committed Oct 20, 2024

Verified

This commit was signed with the committer’s verified signature.
Dragon-Seeker Blodhgarm
commit 15dacbff5395d415ddf52a6f1c3c792fcd033632
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@ base {
}

allprojects {
if (project.name == "owo-neo-publish") return;

apply plugin: "java"
apply plugin: "dev.architectury.loom"
apply plugin: "maven-publish"
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ minecraft_version=1.21.1
yarn_mappings=1.21+build.2
loader_version=2.5.29+0.16.0+1.21
# Mod Properties
mod_version=0.12.15-beta.2
mod_version=0.12.15-beta.3
maven_group=io.wispforest
archives_base_name=owo-lib-neoforge

105 changes: 105 additions & 0 deletions owo-neo-publish/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
plugins {
// Apply the plugin. You can find the latest version at https://projects.neoforged.net/neoforged/ModDevGradle
id 'net.neoforged.moddev' version '2.0.42-beta'
}

apply plugin: "maven-publish"

version = "${rootProject.mod_version}+${rootProject.minecraft_base_version}"
group = rootProject.maven_group

def ENV = System.getenv()

repositories {
maven { url "https://maven.terraformersmc.com/releases/" }
maven { url "https://maven.shedaniel.me/" }
maven {
url "https://api.modrinth.com/maven"
content {
includeGroup "maven.modrinth"
}
}
maven { url "https://maven.nucleoid.xyz/" }
maven { url 'https://maven.wispforest.io/releases' }
maven { url "https://maven.su5ed.dev/releases" }
mavenLocal()
}

dependencies {
implementation(rootProject)

implementation("io.wispforest:endec:0.1.8")
implementation("io.wispforest.endec:netty:0.1.4")
implementation("io.wispforest.endec:gson:0.1.5")
implementation("io.wispforest.endec:jankson:0.1.5")

implementation("blue.endless:jankson:${project.jankson_version}")

implementation("org.sinytra:forgified-fabric-loader:${project.loader_version}:full")


//implementation rootProject.sourceSets.main
}

neoForge {
// We currently only support NeoForge versions later than 21.0.x
// See https://projects.neoforged.net/neoforged/neoforge for the latest updates
version = rootProject.neoforge_version

// Validate AT files and raise errors when they have invalid targets
// This option is false by default, but turning it on is recommended
validateAccessTransformers = true

accessTransformers {
from(rootProject.file("src/main/resources/META-INF/owo.accesstransformer.cfg"))
publish(rootProject.file("src/main/resources/META-INF/owo.accesstransformer.cfg"))
}

interfaceInjectionData {
from(rootProject.file("src/main/resources/interfaces.json"))
publish(rootProject.file("src/main/resources/interfaces.json"))
}

mods {
testproject {
sourceSet sourceSets.main
}
}
}

def targetJavaVersion = 21
tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
it.options.release = targetJavaVersion
}
}

java {
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
if (JavaVersion.current() < javaVersion) {
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
}
archivesBaseName = project.archives_base_name
withSourcesJar()
}

publishing {
publications {
mavenJava(MavenPublication) {
from components.java

artifactId = project.archivesBaseName
}
}

repositories {
maven {
url ENV.MAVEN_URL
credentials {
username ENV.MAVEN_USER
password ENV.MAVEN_PASSWORD
}
}
}
}
5 changes: 5 additions & 0 deletions owo-neo-publish/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx2G

# Mod Properties
archives_base_name=owo-lib-neoforge-dev
8 changes: 7 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -7,4 +7,10 @@ pluginManagement {
}
}

//include 'owo-sentinel'
plugins {
// This plugin allows Gradle to automatically download arbitrary versions of Java for you
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
}

//include 'owo-sentinel'
include 'owo-neo-publish'
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/owo.accesstransformer.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#accessible method net/minecraft/client/gui/screen/Screen addDrawableChild (Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;
public net.minecraft.client.gui.screens.Screen addRenderableWidget(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; # addRenderableWidget
#public net.minecraft.client.gui.screens.Screen addRenderableWidget(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; # addRenderableWidget

#extendable method net/minecraft/item/ItemGroup <init> (Lnet/minecraft/item/ItemGroup$Row;ILnet/minecraft/item/ItemGroup$Type;Lnet/minecraft/text/Text;Ljava/util/function/Supplier;Lnet/minecraft/item/ItemGroup$EntryCollector;Lnet/minecraft/util/Identifier;ZILnet/minecraft/util/Identifier;IILjava/util/List;Ljava/util/List;)V
public net.minecraft.world.item.CreativeModeTab <init>(Lnet/minecraft/world/item/CreativeModeTab$Row;ILnet/minecraft/world/item/CreativeModeTab$Type;Lnet/minecraft/network/chat/Component;Ljava/util/function/Supplier;Lnet/minecraft/world/item/CreativeModeTab$DisplayItemsGenerator;Lnet/minecraft/resources/ResourceLocation;ZILnet/minecraft/resources/ResourceLocation;IILjava/util/List;Ljava/util/List;)V