Skip to content

Commit 0f4a5cc

Browse files
FalsePatternbasdxz
andcommitted
4.0.0
Co-authored-by: Ven <[email protected]>
1 parent 76eae9f commit 0f4a5cc

File tree

381 files changed

+6652
-12041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

381 files changed

+6652
-12041
lines changed

.idea/codeStyles/Project.xml

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/LGPLv3.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSE

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
FalseTweaks
22

3-
Copyright (C) 2022-2024 FalsePattern
3+
Copyright (C) 2022-2025 FalsePattern
44
All Rights Reserved
55

66
The above copyright notice and this permission notice shall be included
77
in all copies or substantial portions of the Software.
88

99
This program is free software: you can redistribute it and/or modify
1010
it under the terms of the GNU Lesser General Public License as published by
11-
the Free Software Foundation, either version 3 of the License, or
12-
(at your option) any later version.
11+
the Free Software Foundation, only version 3 of the License.
1312

1413
This program is distributed in the hope that it will be useful,
1514
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +18,8 @@ GNU General Public License for more details.
1918
You should have received a copy of the GNU Lesser General Public License
2019
along with this program. If not, see <https://www.gnu.org/licenses/>.
2120

21+
--------------------------------
22+
Everything under the assets/minecraft/mcpatcher folder is available under https://creativecommons.org/licenses/by-sa/4.0/
2223
--------------------------------
2324
The following sections are the licenses of code taken from third party sources:
2425

@@ -85,4 +86,28 @@ licensed under the GNU Lesser General Public License, Version 3.
8586
--------------------------------
8687
The mipmapfix memoized exponent logic has been ported from HodgePodge (GTNH Team), which is also
8788
licensed under the GNU Lesser General Public License, Version 3.
89+
--------------------------------
90+
The pending block updates optimization is taken from CoreTweaks (makamys), which is licensed under the MIT license.
91+
92+
MIT License
93+
94+
Copyright (c) 2021 makamys
95+
96+
Permission is hereby granted, free of charge, to any person obtaining a copy
97+
of this software and associated documentation files (the "Software"), to deal
98+
in the Software without restriction, including without limitation the rights
99+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
100+
copies of the Software, and to permit persons to whom the Software is
101+
furnished to do so, subject to the following conditions:
102+
103+
The above copyright notice and this permission notice shall be included in all
104+
copies or substantial portions of the Software.
105+
106+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
107+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
108+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
109+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
110+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
111+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
112+
SOFTWARE.
88113
--------------------------------

README.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Nightly (most likely broken) builds available [here](https://nightly.link/FalseP
88
This mod completely replaces Triangulator and AnimFix. Make sure you delete these two mods before installing FalseTweaks.
99

1010
## List of major features:
11-
- Multithreaded chunk rendering (compatible with OptiFine and FastCraft)
11+
- Multithreaded chunk rendering (requires Beddium)
1212
- Dynamic Lights
1313
- Replaced minecraft's quad-based rendering with triangle-based rendering
1414
- Fixed ambient occlusion and smooth lighting (vanilla bugs MC-138211 and MC-43968)

build.gradle.kts

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("fpgradle-minecraft") version ("0.10.1")
2+
id("com.falsepattern.fpgradle-mc") version "2.0.0"
33
}
44

55
group = "com.falsepattern"
@@ -17,7 +17,6 @@ minecraft_fp {
1717

1818
mixin {
1919
pkg = "mixin.mixins"
20-
pluginClass = "mixin.plugin.standard.MixinPlugin"
2120
extraConfigs = listOf("mixins.falsetweaks.init.json")
2221
}
2322

@@ -51,24 +50,40 @@ minecraft_fp {
5150
}
5251
}
5352

53+
tasks.processResources.configure {
54+
from(configurations.runtimeClasspath.map { it.filter { file -> file.name.contains("megatraceservice") } }) {
55+
into("META-INF/falsepatternlib_repo/mega/megatraceservice/1.2.0/")
56+
}
57+
}
58+
5459
repositories {
5560
cursemavenEX()
56-
exclusive(mavenpattern(), "com.falsepattern", "makamys")
61+
modrinthEX()
62+
exclusive(mavenpattern(), "com.falsepattern", "makamys", "org.embeddedt.celeritas")
5763
exclusive(mega(), "codechicken", "mega")
5864
exclusive(mega_uploads(), "optifine")
65+
exclusive(venmaven(), "com.ventooth")
5966
exclusive(jitpack(), "com.github.basdxz", "com.github.jss2a98aj")
6067
exclusive(horizon(), "com.github.GTNewHorizons", "com.gtnewhorizons.retrofuturabootstrap")
61-
exclusive(ivy("https://files.vexatos.com/", "[module]/[artifact]-[revision].[ext]"), "vexatos")
62-
exclusive(ivy("https://downloads.gtnewhorizons.com/", "[organisation]/[artifact]-[revision].[ext]"), "Mods_for_Twitch")
68+
exclusive(ivy("vexatos", "https://files.vexatos.com/", "[module]/[artifact]-[revision].[ext]"), "vexatos")
69+
exclusive(ivy("horizon-arr", "https://downloads.gtnewhorizons.com/", "[organisation]/[artifact]-[revision].[ext]"), "Mods_for_Twitch")
6370
}
6471

6572
dependencies {
66-
implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.5.9")
73+
implementationSplit("com.falsepattern:falsepatternlib-mc1.7.10:1.9.0")
6774
implementation("org.joml:joml:1.10.8")
68-
implementation("it.unimi.dsi:fastutil:8.5.15")
75+
implementation("it.unimi.dsi:fastutil:8.5.16")
6976
implementation("mega:megatraceservice:1.2.0")
77+
compileOnly("com.ventooth:swansong-mc1.7.10:1.0.0:dev")
78+
compileOnly("maven.modrinth:etfuturum:2.6.2:dev")
7079

71-
compileOnly("makamys:neodymium-mc1.7.10:0.4.3-unofficial:dev")
80+
val beddiumVersion = "1.0.0"
81+
val beddiumVersionJ21 = "$beddiumVersion-j21"
82+
val beddiumVersionJ8 = "$beddiumVersion-j8"
83+
compileOnly("com.ventooth:beddium-mc1.7.10:$beddiumVersionJ8:dev")
84+
modernJavaPatchDeps("com.ventooth:beddium-mc1.7.10:$beddiumVersionJ21:dev") {
85+
excludeDeps()
86+
}
7287

7388
compileOnly("com.github.GTNewHorizons:lwjgl3ify:2.1.5:dev")
7489

@@ -101,4 +116,12 @@ dependencies {
101116
compileOnly(deobfCurse("malisiscore-223896:2283267"))
102117
// SecurityCraft 1.8.13
103118
compileOnly(deobfCurse("securitycraft-64760:2818228"))
119+
// Storage Drawers 1.7.10-1.10.9
120+
compileOnly(deobfCurse("storage-drawers-223852:2469586"))
121+
// CoFH Core [1.7.10]3.1.4-329
122+
compileOnly(deobfCurse("cofh-core-69162:2388750"))
123+
// Thermal Foundation [1.7.10]1.2.6-118
124+
compileOnly(deobfCurse("thermal-foundation-222880:2388752"))
125+
// Thermal Expansion [1.7.10]4.1.5-248
126+
compileOnly(deobfCurse("thermal-expansion-69163:2388758"))
104127
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
org.gradle.configuration-cache=true
2+
org.gradle.caching=true

gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.
212212

213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)