Skip to content

Commit 1c2c3f0

Browse files
FalsePatternFalsePattern
committed
Begin 0.11 development
1 parent 4cbda7a commit 1c2c3f0

File tree

25 files changed

+617
-231
lines changed

25 files changed

+617
-231
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,5 @@ gradle-app.setting
149149
.classpath
150150

151151
# End of https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,forgegradle,java
152+
153+
srgmap.cfg

‎LICENSE‎ renamed to ‎LICENSE.md‎

File renamed without changes.

‎README.MD‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
A library for 1.7.10 with lots of useful stuff, licensed under the LGPL3.0+SNEED license.
22

3-
| Package | Contents / Purpose |
4-
|-----------------------------------------------------------------|-------------------------------------------------------------------------------------------|
5-
| [asm](src/main/java/com/falsepattern/lib/asm) | ASM helper code |
6-
| [compat](src/main/java/com/falsepattern/lib/compat) | Code backported from vanilla 1.12.2 |
7-
| [config](src/main/java/com/falsepattern/lib/config) | 1.12.2-style annotation-based config library |
8-
| [dependencies](src/main/java/com/falsepattern/lib/dependencies) | Runtime dependency loader which uses Maven |
9-
| [mapping](src/main/java/com/falsepattern/lib/mapping) | Notch-SRG-MCP name mapping helper code |
10-
| [mixin](src/main/java/com/falsepattern/lib/mixin) | Mixin loader plugin boilerplate code |
11-
| [text](src/main/java/com/falsepattern/lib/text) | Better Chat and GUI text processing |
12-
| [toasts](src/main/java/com/falsepattern/lib/toasts) | The toast system from newer versions, with some extras |
13-
| [updates](src/main/java/com/falsepattern/lib/updates) | Helper code for update checking |
14-
| [util](src/main/java/com/falsepattern/lib/util) | Additional utilities that do not fit the above categories, see below for more information |
3+
| Package | Contents / Purpose |
4+
|-----------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
5+
| [asm](src/main/java/com/falsepattern/lib/asm) | ASM helper code |
6+
| [compat](src/main/java/com/falsepattern/lib/compat) | Code backported from vanilla 1.12.2 |
7+
| [config](src/main/java/com/falsepattern/lib/config) | 1.12.2-style annotation-based config library |
8+
| [dependencies](src/main/java/com/falsepattern/lib/dependencies) | Runtime dependency loader which uses Maven (DEPRECATED, see [The new data-driven dependency format](src/main/resources/DEPENDENCIES.MD) |
9+
| [mapping](src/main/java/com/falsepattern/lib/mapping) | Notch-SRG-MCP name mapping helper code |
10+
| [mixin](src/main/java/com/falsepattern/lib/mixin) | Mixin loader plugin boilerplate code |
11+
| [text](src/main/java/com/falsepattern/lib/text) | Better Chat and GUI text processing |
12+
| [toasts](src/main/java/com/falsepattern/lib/toasts) | The toast system from newer versions, with some extras |
13+
| [updates](src/main/java/com/falsepattern/lib/updates) | Helper code for update checking |
14+
| [util](src/main/java/com/falsepattern/lib/util) | Additional utilities that do not fit the above categories, see below for more information |
1515

1616
The contents of the [util](src/main/java/com/falsepattern/lib/util) package so far:
1717

@@ -28,6 +28,4 @@ See the [@StableAPI](src/main/java/com/falsepattern/lib/StableAPI.java) annotati
2828
API stability.
2929

3030
The update checker module and the library downloader module can be toggled with the `ENABLE_UPDATE_CHECKER` and
31-
`ENABLE_LIBRARY_DOWNLOADS` booleans in the `falsepatternlib.cfg` config file respectively. Note that the update checker
32-
depends on the module downloader to grab [FJson](https://github.com/FalsePattern/FJson), so if it's not already present
33-
on disk, disabling the library loader breaks the update checker. This is only required the first time download, though.
31+
`ENABLE_LIBRARY_DOWNLOADS` booleans in the `falsepatternlib.cfg` config file respectively.

‎build.gradle‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//version: 1656003793falsepattern59
1+
//version: 1656003793falsepattern60
22
/*
33
DO NOT CHANGE THIS FILE!
44
@@ -282,9 +282,13 @@ if(file("addon.gradle").exists()) {
282282
apply from: 'repositories.gradle'
283283

284284
configurations {
285-
implementation.extendsFrom(shadowImplementation) // TODO: remove after all uses are refactored
286-
implementation.extendsFrom(shadowCompile)
287-
implementation.extendsFrom(shadeCompile)
285+
for (config in [shadowImplementation, shadowCompile, shadeCompile]) {
286+
implementation.extendsFrom(shadeCompile)
287+
compileClasspath.extendsFrom(config)
288+
runtimeClasspath.extendsFrom(config)
289+
testCompileClasspath.extendsFrom(config)
290+
testRuntimeClasspath.extendsFrom(config)
291+
}
288292
}
289293

290294
repositories {
@@ -314,6 +318,8 @@ dependencies {
314318
compile("org.spongepowered:mixin:0.8.5-gasstation_7")
315319
compile("com.llamalad7:MixinExtras:0.1.1-gasstation")
316320
compile("com.falsepattern:00gasstation-mc1.7.10:0.5.1:dev")
321+
runtimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
322+
testRuntimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
317323
} else if(hasMixinDeps.toBoolean()) {
318324
runtime("com.llamalad7:MixinExtras:0.1.1-gasstation")
319325
runtime("org.spongepowered:mixin:0.8.5-gasstation_7")
@@ -668,8 +674,11 @@ publish.dependsOn(build)
668674
publishing {
669675
publications {
670676
maven(MavenPublication) {
677+
from components.java
671678
artifact source: usesShadowedDependencies.toBoolean() ? shadowJar : jar, classifier: ""
672-
artifact source: sourcesJar, classifier: "sources"
679+
if (!project.hasProperty("noPublishedSources") || !noPublishedSources) {
680+
artifact source: sourcesJar, classifier: "sources"
681+
}
673682
artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
674683
if (apiPackage) {
675684
artifact source: apiJar, classifier: "api"

‎dependencies.gradle‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
dependencies {
2+
//Dev-only deps
23
compileOnly("org.projectlombok:lombok:1.18.24") {
34
transitive = false
45
}
5-
compileOnly("org.spongepowered:mixin:0.8.3-gasstation")
6-
compileOnly("com.llamalad7:MixinExtras:0.0.12-gasstation")
7-
compileOnly("com.falsepattern:00gasstation-mc1.7.10:0.2.1:dev")
8-
compileOnly("com.falsepattern:json:0.4.1")
9-
compileOnly("org.tukaani:xz:1.9")
10-
testCompile("org.tukaani:xz:1.9")
11-
annotationProcessor("org.projectlombok:lombok:1.18.22")
6+
annotationProcessor("org.projectlombok:lombok:1.18.24")
7+
8+
compileOnly("org.jetbrains:annotations:23.1.0")
9+
10+
//Mod deps
11+
compileOnly("org.spongepowered:mixin:0.8.5-gasstation_7")
12+
compileOnly("com.llamalad7:MixinExtras:0.1.1-gasstation")
13+
compileOnly("com.falsepattern:00gasstation-mc1.7.10:0.5.1:dev")
1214
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ containsMixinsAndOrCoreModOnly = false
187187

188188
# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
189189
# responsibility check the licence and request permission for distribution, if required.
190-
usesShadowedDependencies = false
190+
usesShadowedDependencies = true
191191

192192
# If enabled, class stubbing will be enabled. In this mode, all classes with a package named "stubpackage" in their
193193
# path will be removed, and all classes that refer to said classes will be modified so that the "stubpackage" will map

‎repositories.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ repositories {
1111
name = "mvnpattern"
1212
url = "https://mvn.falsepattern.com/releases/"
1313
}
14+
maven {
15+
name = "repsy_ventooth"
16+
url = "https://repo.repsy.io/mvn/ventooth/public/"
17+
}
1418
}

‎src/main/java/com/falsepattern/lib/DeprecationDetails.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@
3434
@StableAPI(since = "0.10.0")
3535
public @interface DeprecationDetails {
3636
@StableAPI.Expose String deprecatedSince();
37+
@StableAPI.Expose(since = "0.11.0") String replacement() default "";
3738
}

‎src/main/java/com/falsepattern/lib/dependencies/ComplexVersion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public int compareTo(@NonNull Version o) {
5656
}
5757
} else if (o instanceof SemanticVersion) {
5858
val other = (SemanticVersion) o;
59-
val result = other.compareTo(versions[0]);
59+
val result = versions[0].compareTo(other);
6060
if (result != 0) {
6161
return result;
6262
}

‎src/main/java/com/falsepattern/lib/dependencies/DependencyLoader.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@
2828
import java.util.concurrent.CompletableFuture;
2929

3030

31+
/**
32+
* DEPRECATED. See the DEPENDENCIES.MD files in the root of the resources for more information.
33+
* <p>
34+
* This class will stay here for legacy compatibility
35+
*/
36+
@Deprecated
37+
@DeprecationDetails(deprecatedSince = "0.11.0")
3138
@StableAPI(since = "0.6.0")
3239
public class DependencyLoader {
3340

@@ -64,8 +71,9 @@ public static VoidBuilder builder() {
6471
return new VoidBuilder();
6572
}
6673

67-
@StableAPI(since = "0.6.0")
74+
@Deprecated
6875
@DeprecationDetails(deprecatedSince = "0.10.0")
76+
@StableAPI(since = "0.6.0")
6977
public static class VoidBuilder {
7078
private String loadingModId;
7179
private String groupId;

0 commit comments

Comments
 (0)