Add uncommitted changes
This commit is contained in:
parent
f373ffb27c
commit
181258d646
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,2 +1,2 @@
|
||||||
#Thu Apr 17 16:02:04 MST 2025
|
#Sun May 18 10:19:41 MST 2025
|
||||||
gradle.version=8.8
|
gradle.version=8.8
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -1 +0,0 @@
|
||||||
raven-bS
|
|
||||||
|
|
@ -1,21 +1,21 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<annotationProcessing>
|
<annotationProcessing>
|
||||||
<profile name="Gradle Imported" enabled="true">
|
<profile name="Gradle Imported" enabled="true">
|
||||||
<outputRelativeToContentRoot value="true" />
|
<outputRelativeToContentRoot value="true" />
|
||||||
<option name="defaultObfuscationEnv" value="named:intermediary" />
|
<option name="defaultObfuscationEnv" value="named:intermediary" />
|
||||||
<option name="inMapFileNamedIntermediary" value="C:\Users\jackh\.gradle\caches\essential-loom\1.8.9\de.oceanlabs.mcp.mcp_stable.1_8_9.22-1.8.9-forge-1.8.9-11.15.1.2318-1.8.9\mappings-mixin-srg.tiny" />
|
<option name="inMapFileNamedIntermediary" value="C:\Users\jackh\.gradle\caches\essential-loom\1.8.9\de.oceanlabs.mcp.mcp_stable.1_8_9.22-1.8.9-forge-1.8.9-11.15.1.2318-1.8.9\mappings-mixin-srg.tiny" />
|
||||||
<option name="outMapFileNamedIntermediary" value="C:\Users\jackh\Desktop\raven bs premium\raven-bs-alpha\build\loom-cache\mixin-map-de.oceanlabs.mcp.mcp_stable.1_8_9.22-1.8.9-forge-1.8.9-11.15.1.2318-1.8.9.0.tiny" />
|
<option name="outMapFileNamedIntermediary" value="C:\Users\jackh\Desktop\raven bs premium\raven-bs-alpha\build\loom-cache\mixin-map-de.oceanlabs.mcp.mcp_stable.1_8_9.22-1.8.9-forge-1.8.9-11.15.1.2318-1.8.9.1.tiny" />
|
||||||
<option name="outRefMapFile" value="C:\Users\jackh\Desktop\raven bs premium\raven-bs-alpha\build\classes\java\main\mixins.raven.refmap.json" />
|
<option name="outRefMapFile" value="C:\Users\jackh\Desktop\raven bs premium\raven-bs-alpha\build\classes\java\main\mixins.raven.refmap.json" />
|
||||||
<processorPath useClasspath="false">
|
<processorPath useClasspath="false">
|
||||||
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.spongepowered/mixin/0.8.5-SNAPSHOT/afd548f754a72df63a853c0cc1d064b6fcf76441/mixin-0.8.5-SNAPSHOT.jar" />
|
<entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.spongepowered/mixin/0.8.5-SNAPSHOT/afd548f754a72df63a853c0cc1d064b6fcf76441/mixin-0.8.5-SNAPSHOT.jar" />
|
||||||
</processorPath>
|
</processorPath>
|
||||||
<module name="raven-bS.main" />
|
<module name="raven-bs-alpha.raven-bS.main" />
|
||||||
</profile>
|
</profile>
|
||||||
</annotationProcessing>
|
</annotationProcessing>
|
||||||
<bytecodeTargetLevel target="1.8">
|
<bytecodeTargetLevel target="1.8">
|
||||||
<module name="raven-bs-alpha.main" target="1.8" />
|
<module name="raven-bs-alpha.main" target="1.8" />
|
||||||
</bytecodeTargetLevel>
|
</bytecodeTargetLevel>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,17 +1,17 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="GradleMigrationSettings" migrationVersion="1" />
|
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="gradleJvm" value="21" />
|
<option name="gradleJvm" value="temurin-17" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
<set>
|
<set>
|
||||||
<option value="$PROJECT_DIR$" />
|
<option value="$PROJECT_DIR$" />
|
||||||
</set>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
</GradleProjectSettings>
|
</GradleProjectSettings>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
|
<component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/.idea/modules/raven-bS.main.iml" filepath="$PROJECT_DIR$/.idea/modules/raven-bS.main.iml" />
|
<module fileurl="file://$PROJECT_DIR$/.idea/modules/raven-bS.iml" filepath="$PROJECT_DIR$/.idea/modules/raven-bS.iml" />
|
||||||
</modules>
|
<module fileurl="file://$PROJECT_DIR$/.idea/modules/raven-bS.test.iml" filepath="$PROJECT_DIR$/.idea/modules/raven-bS.test.iml" />
|
||||||
</component>
|
<module fileurl="file://$PROJECT_DIR$/.idea/modules/raven-bs-alpha.raven-bS.main.iml" filepath="$PROJECT_DIR$/.idea/modules/raven-bs-alpha.raven-bS.main.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module version="4">
|
<module version="4">
|
||||||
<component name="AdditionalModuleElements">
|
<component name="AdditionalModuleElements">
|
||||||
<content url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main">
|
<content url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
|
<sourceFolder url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
|
||||||
</content>
|
</content>
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module version="4">
|
||||||
|
<component name="AdditionalModuleElements">
|
||||||
|
<content url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main">
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
|
||||||
|
</content>
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
1371
.idea/workspace.xml
1371
.idea/workspace.xml
File diff suppressed because it is too large
Load Diff
310
build.gradle.kts
310
build.gradle.kts
|
|
@ -1,156 +1,156 @@
|
||||||
import org.apache.commons.lang3.SystemUtils
|
import org.apache.commons.lang3.SystemUtils
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
idea
|
idea
|
||||||
java
|
java
|
||||||
id("gg.essential.loom") version "0.10.0.5"
|
id("gg.essential.loom") version "0.10.0.5"
|
||||||
id("dev.architectury.architectury-pack200") version "0.1.3"
|
id("dev.architectury.architectury-pack200") version "0.1.3"
|
||||||
id("com.github.johnrengelman.shadow") version "8.1.1"
|
id("com.github.johnrengelman.shadow") version "8.1.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
val baseGroup: String by project
|
val baseGroup: String by project
|
||||||
val mcVersion: String by project
|
val mcVersion: String by project
|
||||||
val version: String by project
|
val version: String by project
|
||||||
val mixinGroup = "$baseGroup.mixin"
|
val mixinGroup = "$baseGroup.mixin"
|
||||||
val modid: String by project
|
val modid: String by project
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion.set(JavaLanguageVersion.of(8))
|
toolchain.languageVersion.set(JavaLanguageVersion.of(8))
|
||||||
}
|
}
|
||||||
|
|
||||||
loom {
|
loom {
|
||||||
log4jConfigs.from(file("log4j2.xml"))
|
log4jConfigs.from(file("log4j2.xml"))
|
||||||
launchConfigs {
|
launchConfigs {
|
||||||
"client" {
|
"client" {
|
||||||
property("mixin.debug", "true")
|
property("mixin.debug", "true")
|
||||||
arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
|
arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
runConfigs {
|
runConfigs {
|
||||||
"client" {
|
"client" {
|
||||||
if (SystemUtils.IS_OS_MAC_OSX) {
|
if (SystemUtils.IS_OS_MAC_OSX) {
|
||||||
vmArgs.remove("-XstartOnFirstThread")
|
vmArgs.remove("-XstartOnFirstThread")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
remove(getByName("server"))
|
remove(getByName("server"))
|
||||||
}
|
}
|
||||||
forge {
|
forge {
|
||||||
pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
|
pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
|
||||||
mixinConfig("mixins.raven.json")
|
mixinConfig("mixins.raven.json")
|
||||||
}
|
}
|
||||||
|
|
||||||
mixin {
|
mixin {
|
||||||
defaultRefmapName.set("mixins.raven.refmap.json")
|
defaultRefmapName.set("mixins.raven.refmap.json")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets.main {
|
sourceSets.main {
|
||||||
output.setResourcesDir(sourceSets.main.flatMap { it.java.classesDirectory })
|
output.setResourcesDir(sourceSets.main.flatMap { it.java.classesDirectory })
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven("https://repo.spongepowered.org/maven/")
|
maven("https://repo.spongepowered.org/maven/")
|
||||||
}
|
}
|
||||||
|
|
||||||
val shadowImpl: Configuration by configurations.creating {
|
val shadowImpl: Configuration by configurations.creating {
|
||||||
configurations.implementation.get().extendsFrom(this)
|
configurations.implementation.get().extendsFrom(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft("com.mojang:minecraft:1.8.9")
|
minecraft("com.mojang:minecraft:1.8.9")
|
||||||
mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
|
mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
|
||||||
forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
|
forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
|
||||||
|
|
||||||
shadowImpl("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
|
shadowImpl("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
|
||||||
isTransitive = false
|
isTransitive = false
|
||||||
exclude(module = "gson")
|
exclude(module = "gson")
|
||||||
exclude(module = "guava")
|
exclude(module = "guava")
|
||||||
exclude(module = "jarjar")
|
exclude(module = "jarjar")
|
||||||
exclude(module = "commons-codec")
|
exclude(module = "commons-codec")
|
||||||
exclude(module = "commons-io")
|
exclude(module = "commons-io")
|
||||||
exclude(module = "launchwrapper")
|
exclude(module = "launchwrapper")
|
||||||
exclude(module = "asm-commons")
|
exclude(module = "asm-commons")
|
||||||
exclude(module = "slf4j-api")
|
exclude(module = "slf4j-api")
|
||||||
}
|
}
|
||||||
annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT")
|
annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT")
|
||||||
shadowImpl("org.java-websocket:Java-WebSocket:1.6.0")
|
shadowImpl("org.java-websocket:Java-WebSocket:1.6.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile::class) {
|
tasks.withType(JavaCompile::class) {
|
||||||
options.encoding = "UTF-8"
|
options.encoding = "UTF-8"
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(org.gradle.jvm.tasks.Jar::class) {
|
tasks.withType(org.gradle.jvm.tasks.Jar::class) {
|
||||||
archiveBaseName.set(modid)
|
archiveBaseName.set(modid)
|
||||||
manifest.attributes.run {
|
manifest.attributes.run {
|
||||||
this["FMLCorePluginContainsFMLMod"] = "true"
|
this["FMLCorePluginContainsFMLMod"] = "true"
|
||||||
this["ForceLoadAsMod"] = "true"
|
this["ForceLoadAsMod"] = "true"
|
||||||
|
|
||||||
this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"
|
this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"
|
||||||
this["MixinConfigs"] = "mixins.raven.json"
|
this["MixinConfigs"] = "mixins.raven.json"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.processResources {
|
tasks.processResources {
|
||||||
inputs.property("version", project.version)
|
inputs.property("version", project.version)
|
||||||
inputs.property("mcversion", mcVersion)
|
inputs.property("mcversion", mcVersion)
|
||||||
inputs.property("modid", modid)
|
inputs.property("modid", modid)
|
||||||
inputs.property("basePackage", baseGroup)
|
inputs.property("basePackage", baseGroup)
|
||||||
|
|
||||||
filesMatching(listOf("mcmod.info", "mixins.raven.json")) {
|
filesMatching(listOf("mcmod.info", "mixins.raven.json")) {
|
||||||
expand(inputs.properties)
|
expand(inputs.properties)
|
||||||
}
|
}
|
||||||
|
|
||||||
rename("accesstransformer.cfg", "META-INF/${modid}_at.cfg")
|
rename("accesstransformer.cfg", "META-INF/${modid}_at.cfg")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
val remapJar by tasks.named<net.fabricmc.loom.task.RemapJarTask>("remapJar") {
|
val remapJar by tasks.named<net.fabricmc.loom.task.RemapJarTask>("remapJar") {
|
||||||
archiveClassifier.set("")
|
archiveClassifier.set("")
|
||||||
from(tasks.shadowJar)
|
from(tasks.shadowJar)
|
||||||
input.set(tasks.shadowJar.get().archiveFile)
|
input.set(tasks.shadowJar.get().archiveFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.jar {
|
tasks.jar {
|
||||||
archiveClassifier.set("without-deps")
|
archiveClassifier.set("without-deps")
|
||||||
destinationDirectory.set(layout.buildDirectory.dir("intermediates"))
|
destinationDirectory.set(layout.buildDirectory.dir("intermediates"))
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.shadowJar {
|
tasks.shadowJar {
|
||||||
destinationDirectory.set(layout.buildDirectory.dir("intermediates"))
|
destinationDirectory.set(layout.buildDirectory.dir("intermediates"))
|
||||||
archiveClassifier.set("non-obfuscated-with-deps")
|
archiveClassifier.set("non-obfuscated-with-deps")
|
||||||
configurations = listOf(shadowImpl)
|
configurations = listOf(shadowImpl)
|
||||||
|
|
||||||
exclude(
|
exclude(
|
||||||
"dummyThing",
|
"dummyThing",
|
||||||
"LICENSE.txt",
|
"LICENSE.txt",
|
||||||
"META-INF/MUMFREY.RSA",
|
"META-INF/MUMFREY.RSA",
|
||||||
"META-INF/maven/**",
|
"META-INF/maven/**",
|
||||||
"org/**/*.html",
|
"org/**/*.html",
|
||||||
"LICENSE.md",
|
"LICENSE.md",
|
||||||
"pack.mcmeta",
|
"pack.mcmeta",
|
||||||
"**/module-info.class",
|
"**/module-info.class",
|
||||||
"*.so",
|
"*.so",
|
||||||
"*.dylib",
|
"*.dylib",
|
||||||
"*.dll",
|
"*.dll",
|
||||||
"*.jnilib",
|
"*.jnilib",
|
||||||
"ibxm/**",
|
"ibxm/**",
|
||||||
"com/jcraft/**",
|
"com/jcraft/**",
|
||||||
"org/lwjgl/**",
|
"org/lwjgl/**",
|
||||||
"net/java/**",
|
"net/java/**",
|
||||||
"META-INF/proguard/**",
|
"META-INF/proguard/**",
|
||||||
"META-INF/versions/**",
|
"META-INF/versions/**",
|
||||||
"META-INF/com.android.tools/**",
|
"META-INF/com.android.tools/**",
|
||||||
"fabric.mod.json"
|
"fabric.mod.json"
|
||||||
)
|
)
|
||||||
|
|
||||||
doLast {
|
doLast {
|
||||||
configurations.forEach {
|
configurations.forEach {
|
||||||
println("Copying dependencies into mod: ${it.files}")
|
println("Copying dependencies into mod: ${it.files}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fun relocate(name: String) = relocate(name, "$baseGroup.deps.$name")
|
fun relocate(name: String) = relocate(name, "$baseGroup.deps.$name")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.assemble.get().dependsOn(tasks.remapJar)
|
tasks.assemble.get().dependsOn(tasks.remapJar)
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#version 120
|
#version 120
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
gl_TexCoord[0] = gl_MultiTexCoord0;
|
gl_TexCoord[0] = gl_MultiTexCoord0;
|
||||||
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
|
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
|
||||||
}
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue