Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
f544ebf
Consolidate build
ah-OOG-ah Apr 8, 2025
ea3cc3e
Update GasStation's license
ah-OOG-ah Jun 7, 2025
cda6dfc
Obliteration
ah-OOG-ah Jun 7, 2025
59f4175
Add mavens for plugins
ah-OOG-ah Jun 7, 2025
43042cd
Update gradlew
ah-OOG-ah Jun 7, 2025
3c21983
Add Unimined
ah-OOG-ah Jun 7, 2025
689f92e
Obliterate mixin module and add it to project
ah-OOG-ah Jun 7, 2025
7d82258
nope go back
ah-OOG-ah Jun 7, 2025
0066b48
Move properties to buildscript variables
ah-OOG-ah Jun 7, 2025
752c185
Rename and enable common
ah-OOG-ah Jun 7, 2025
bd9dca5
Update build.gradle.kts
ah-OOG-ah Jun 7, 2025
e7e38e2
Reenable common module
ah-OOG-ah Jun 7, 2025
ebf46d9
Add mixin module
ah-OOG-ah Jun 7, 2025
fb4ac22
Initial port of mixin module BS
ah-OOG-ah Jun 7, 2025
8153678
Hack out non-UniMix flavors
ah-OOG-ah Jun 9, 2025
3327703
Fix versioning
ah-OOG-ah Jun 9, 2025
6701a1b
Rearrange mixin project build
ah-OOG-ah Jun 9, 2025
3fe1269
Remove errant classifier
ah-OOG-ah Jun 9, 2025
7ba0d6f
Attempt to fix version replacement
ah-OOG-ah Jun 9, 2025
0a10e2c
Actually fix the mcmod.info
ah-OOG-ah Jun 9, 2025
dff5a9d
Update build.gradle.kts
ah-OOG-ah Jun 9, 2025
5fbb406
Remove old buildscripts
ah-OOG-ah Jun 9, 2025
c0b368c
Enable compat module
ah-OOG-ah Jun 9, 2025
f09aed0
Fix compat module BS
ah-OOG-ah Jun 9, 2025
5fc8e5b
Enable and patch compatfuture
ah-OOG-ah Jun 9, 2025
6b67057
Enable MixingASM
ah-OOG-ah Jun 9, 2025
1eb68f7
Fix versioning AGAIN
ah-OOG-ah Jun 9, 2025
63e3953
how
ah-OOG-ah Jun 9, 2025
301a070
Fix Mixingasm
ah-OOG-ah Jun 10, 2025
9627890
Add Spongemixins
ah-OOG-ah Jun 10, 2025
21735c0
Enable MixinBooterLegacy
ah-OOG-ah Jun 10, 2025
f36c45e
Attempt to fix MBL version
ah-OOG-ah Jun 11, 2025
54424d7
Give up, just use metadata
ah-OOG-ah Jun 11, 2025
90f3dcc
Add shadowed artifact
ah-OOG-ah Jun 11, 2025
e7923da
Enable Gasstation
ah-OOG-ah Jun 11, 2025
1c623d7
Publish shadow artifact for Mixingasm
ah-OOG-ah Jun 11, 2025
091b30b
Enable GTNHMixins
ah-OOG-ah Jun 11, 2025
07ca8db
Add MixinExtras
ah-OOG-ah Jun 12, 2025
5899401
Enable all module
ah-OOG-ah Jun 12, 2025
8f55434
Add shadowJar artifacts
ah-OOG-ah Jun 12, 2025
1263d1b
Fix jar naming for the all module
ah-OOG-ah Jun 12, 2025
d5b9033
Shade everything in the -all module
ah-OOG-ah Jun 12, 2025
74b9393
Add mcmod.info to all module
ah-OOG-ah Jun 12, 2025
454a473
oops
ah-OOG-ah Jun 12, 2025
01853f2
Merge mcmod.info files properly
ah-OOG-ah Jun 13, 2025
bba6fe8
Update AllCore.java
ah-OOG-ah Jun 13, 2025
7f2abaf
Update build.gradle.kts
ah-OOG-ah Jun 13, 2025
c75fdf5
Move shadow application to main BS
ah-OOG-ah Jun 13, 2025
868a305
Move core mod setting to main BS
ah-OOG-ah Jun 13, 2025
775b6a6
Add a file for each coremod
ah-OOG-ah Jun 13, 2025
d0b94d1
Pull McmodInfoMerger into buildSrc
ah-OOG-ah Jun 13, 2025
5c92143
Move subprojects block into buildSrc
ah-OOG-ah Jun 13, 2025
2c48303
Move FMLCorePlugin definition to gradle.properties
ah-OOG-ah Jun 14, 2025
b51a23a
Move convention plugin to class plugin
ah-OOG-ah Jun 14, 2025
b9951f7
Load merged plugin file
ah-OOG-ah Jun 14, 2025
124f1b5
Update AllCore.java
ah-OOG-ah Jun 14, 2025
752c66d
Add all core plugin
ah-OOG-ah Jun 15, 2025
22dc439
Change "true" to true
ah-OOG-ah Jun 15, 2025
763020e
Rename buildSrc
ah-OOG-ah Jun 16, 2025
7a1496c
Delete build.gradle.disabled
ah-OOG-ah Jun 16, 2025
1060c1d
Apply manifest attributes from old buildscript
ah-OOG-ah Jun 16, 2025
3aa9962
Fix wrong MANIFEST.MF being included
ah-OOG-ah Jun 16, 2025
579256e
Add commit ID to manifests
ah-OOG-ah Jun 16, 2025
47bf297
Bump to Gradle 8.14.2
ah-OOG-ah Jun 16, 2025
aada5bf
Add extension for global values
ah-OOG-ah Jun 16, 2025
7815282
Move uniMixVersion to DSL block
ah-OOG-ah Jun 16, 2025
66c33ef
Remove different local identifier
ah-OOG-ah Jun 16, 2025
fb26471
Add implementation version to all jar
ah-OOG-ah Jun 16, 2025
e892727
Fix incorrect string coercion
ah-OOG-ah Jun 16, 2025
eedb41e
Fix incorrect license copy
ah-OOG-ah Jun 16, 2025
f447a96
Use proper includes to grab more licenses
ah-OOG-ah Jun 16, 2025
d583781
Update .gitignore
ah-OOG-ah Jun 16, 2025
a87d3c6
Use shadowJar for common as well
ah-OOG-ah Jun 16, 2025
f9740e6
Fix service merging
ah-OOG-ah Jun 17, 2025
697e8a1
Copy Mixin license files to modularized location
ah-OOG-ah Jun 17, 2025
90dc8f9
Remove errant README
ah-OOG-ah Jun 17, 2025
0086944
Merge service files
ah-OOG-ah Jun 17, 2025
60969ff
Exclude non-class files from GTNH-MixinExtras
ah-OOG-ah Jun 17, 2025
caa1053
Use standard git-version
ah-OOG-ah Jun 17, 2025
23057cb
Fix common processResources task
ah-OOG-ah Jun 17, 2025
2cc3379
Use metadata for Unimixins version
ah-OOG-ah Jun 18, 2025
b25075e
remove project. where reasonable
ah-OOG-ah Jun 18, 2025
d8d80a3
Apply shadowJar and jar configuration by plugin
ah-OOG-ah Jun 19, 2025
830d681
Add separate plugin to apply extension
ah-OOG-ah Jun 19, 2025
1f15b3e
Rely on extender to create extension
ah-OOG-ah Jun 19, 2025
439defb
Use unimixins ext for setting the core plugin
ah-OOG-ah Jun 19, 2025
5198ed7
Remove manual newlines from mcmod.info
ah-OOG-ah Jun 19, 2025
de34b41
Switch back to standard artifacts
ah-OOG-ah Jun 20, 2025
1c48884
Shadow submodules
ah-OOG-ah Jun 20, 2025
0815f55
Update UniMixinsPlugin.kt
ah-OOG-ah Jun 20, 2025
051e7b5
Add -dev and normal jars to assemble task
ah-OOG-ah Jun 20, 2025
ec57ec1
Add sources jar
ah-OOG-ah Jun 20, 2025
36389a4
Fix typo - use fmlCorePlugin, not uniMixVersion
ah-OOG-ah Jun 20, 2025
b9f1dba
Add configs for shading sources
ah-OOG-ah Jun 20, 2025
da4e4d0
Update UniMixinsPlugin.kt
ah-OOG-ah Jun 20, 2025
dd04399
Lazily add deps, so it actually works
ah-OOG-ah Jun 20, 2025
9c7fb85
Properly set up shadow config extension
ah-OOG-ah Jun 20, 2025
441b41e
Update MixinExtras for the shadow setup
ah-OOG-ah Jun 20, 2025
0aa5709
Fix source shading
ah-OOG-ah Jun 25, 2025
1100903
Make shadowImplSources take project deps
ah-OOG-ah Jun 26, 2025
8537f8e
Update build.gradle.kts
ah-OOG-ah Jun 26, 2025
c1031c9
Remove useless include
ah-OOG-ah Jun 26, 2025
50b5b37
Use existing configuration for shading
ah-OOG-ah Jun 26, 2025
6901315
Remove redundant extra configuration
ah-OOG-ah Jun 26, 2025
1d83447
forgor
ah-OOG-ah Jun 26, 2025
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
203 changes: 203 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
Part of the buildscript is adapted from https://github.com/LogicFan/shadow-json-transformer under the Apache v2 license.
The license text is below:
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
21 changes: 13 additions & 8 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,27 @@ Refer to CREDITS, LICENSE, and README.original.md (whichever of these exist)
inside their directories for full information, including reproductions of their
original license texts.

## SpongeMixins
Part of the buildscript is adapted from https://github.com/LogicFan/shadow-json-transformer under the Apache v2 license.
Requisite notices are in CREDITS in the repository root. Another part is adapted from
https://github.com/GTNewHorizons/GTNHGradle under the LGPLv3. Again, requisite notices are in CREDITS.

Directory: module-spongemixins
## SpongeMixins
Directory: spongemixins
LICENSE: LGPLv3

## MixinBooterLegacy

Directory: module-mixinbooterlegacy
Directory: mixinbooterlegacy
LICENSE: LGPLv2.1

## GasStation

Directory: module-gasstation
LICENSE: LGPLv3+SNEED
Directory: gasstation
LICENSE: LGPLv3

## GTNHMixins
Directory: gtnhmixins
LICENSE: LGPLv3

Directory: module-gtnhmixins
## UniMixinsPlugin
Directory: UniMixinsPlugin
LICENSE: LGPLv3
Not technically a module proper, it just hosts shared build logic for the others.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ The project needs to be compiled using Java 8. For example: `JAVA_HOME=/path/to/
* `-Plocal`: use the locally built version of `unimix` when building the Mixin module.
* Invoke `./gradlew publishToMavenLocal` in the UniMix repo first to install a local build.
* `-PenableAltMixin`: build alternate flavors of the Mixin module, not just UniMix.
* `-PpublishAll`: publish all modules, not just the combined one.

### Roadmap

Expand Down
2 changes: 2 additions & 0 deletions UniMixinsPlugin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.gradle
.kotlin
45 changes: 45 additions & 0 deletions UniMixinsPlugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
plugins {
kotlin("jvm") version "2.1.21"
`java-gradle-plugin`
}

repositories {
mavenCentral()
gradlePluginPortal()
maven {
url = uri("https://maven.wagyourtail.xyz/releases")
}
}

dependencies {
implementation("xyz.wagyourtail.unimined:xyz.wagyourtail.unimined.gradle.plugin:1.3.14")
implementation("com.palantir.git-version:com.palantir.git-version.gradle.plugin:3.3.0")
implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.6")
implementation("com.google.code.gson:gson:2.13.1")
implementation("org.apache.ant:ant:1.10.15")
}

gradlePlugin {
plugins {
create("unimixinsConfig") {
id = "unimixinsConfig"
implementationClass = "UniMixinsExtender"
}
create("unimixins") {
id = "unimixins"
implementationClass = "UniMixinsPlugin"
}
}
}

kotlin {
jvmToolchain(21)
}

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}
1 change: 1 addition & 0 deletions UniMixinsPlugin/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "UniMixinsPlugin"
Loading
Loading