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.

Sign up for GitHub

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

Short circuited #9

Closed
wants to merge 6 commits into from
Closed

Short circuited #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
998b2fa
gut core mod
matt-159 May 18, 2024
04e85d1
update buildscript
matt-159 May 18, 2024
2a1af0b
update mod properties
matt-159 May 19, 2024
ca78941
pack loads again
matt-159 May 19, 2024
b6dc1b4
clean up
matt-159 May 19, 2024
c96301d
bump gt5u version
matt-159 May 19, 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
141 changes: 93 additions & 48 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1656003793falsepattern62
//version: 1656003793falsepattern75
/*
DO NOT CHANGE THIS FILE!

Expand Down Expand Up @@ -132,6 +132,8 @@ propertyDefaultIfUnset("mixinConfigs", "")
propertyDefaultIfUnset("mixinPluginPreInit", "")
propertyDefaultIfUnset("mixinPluginMinimumVersion", "0.8.5")
propertyDefaultIfUnset("remapStubs", false)
propertyDefaultIfUnset("apiPackages", null)
propertyDefaultIfUnset("apiPackagesNoRecurse", null)

propertyDefaultIfUnset("modrinthProjectId", "")
propertyDefaultIfUnset("modrinthDependencies", "")
Expand All @@ -147,20 +149,31 @@ String javaSourceDir = "src/main/java/"
String scalaSourceDir = "src/main/scala/"
String kotlinSourceDir = "src/main/kotlin/"

String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
def verifyPackage(thePackage, propName) {
String javaSourceDir = "src/main/java/"
String scalaSourceDir = "src/main/scala/"
String kotlinSourceDir = "src/main/kotlin/"
String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + thePackage.toString().replaceAll("\\.", "/")
String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + thePackage.toString().replaceAll("\\.", "/")
String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + thePackage.toString().replaceAll("\\.", "/")
if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
throw new GradleException("Could not resolve \"${propName}\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
}
}

verifyPackage("", "modGroup")

if(apiPackage) {
targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
}
verifyPackage(apiPackage, "apiPackage")
}


if (apiPackages) {
apiPackages.tokenize(';').forEach { it -> verifyPackage(it, "apiPackages")}
}

if (apiPackagesNoRecurse) {
apiPackagesNoRecurse.tokenize(';').forEach { it -> verifyPackage(it, "apiPackagesNoRecurse")}
}

if(accessTransformersFile) {
Expand All @@ -175,9 +188,9 @@ if(usesMixins.toBoolean()) {
throw new GradleException("\"usesMixins\" requires \"mixinsPackage\" to be set!")
}

targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
}
Expand Down Expand Up @@ -281,6 +294,10 @@ if(file("addon.gradle").exists()) {

apply from: 'repositories.gradle'

if(file('repositories_override.gradle').exists()) {
apply from: 'repositories_override.gradle'
}

configurations {
for (config in [shadowImplementation, shadowCompile, shadeCompile]) {
implementation.extendsFrom(shadeCompile)
Expand All @@ -305,36 +322,52 @@ repositories {
name = "sponge2"
url = "https://mvn.falsepattern.com/sponge"
}
maven {
name = "jitpack"
url = "https://mvn.falsepattern.com/jitpack/"
}
}
}

def unimixinsVersion = "0.1.15"

dependencies {
if(usesMixins.toBoolean()) {
annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
annotationProcessor("com.google.guava:guava:24.1.1-jre")
annotationProcessor("com.google.code.gson:gson:2.8.6")
annotationProcessor("com.llamalad7:MixinExtras:0.1.1-gasstation")
annotationProcessor("org.spongepowered:mixin:0.8.5-gasstation_7")
compile("org.spongepowered:mixin:0.8.5-gasstation_7")
compile("com.llamalad7:MixinExtras:0.1.1-gasstation")
compile("com.falsepattern:00gasstation-mc1.7.10:0.5.1:dev")
runtimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
testRuntimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
annotationProcessor("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16')
} else if(hasMixinDeps.toBoolean()) {
runtime("com.llamalad7:MixinExtras:0.1.1-gasstation")
runtime("org.spongepowered:mixin:0.8.5-gasstation_7")
runtime("com.falsepattern:00gasstation-mc1.7.10:0.5.1:dev")
runtimeOnly("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
}
// Latest LWJGL
compile "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
compile "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
implementation "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
implementation "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
minecraftNatives "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209"
minecraftDeps "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
minecraftDeps "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
}


if(usesMixins.toBoolean()) {
configurations.implementation.dependencies.each {
if (it instanceof ExternalModuleDependency) {
it.exclude module: "SpongeMixins"
it.exclude module: "SpongePoweredMixin"
it.exclude module: "00gasstation-mc1.7.10"
it.exclude module: "gtnhmixins"
}
}
}

apply from: 'dependencies.gradle'

if(file('dependencies_override.gradle').exists()) {
apply from: 'dependencies_override.gradle'
}

def mixinDir = new File(project.buildDir, 'mixins')
if (!mixinDir.exists()) {
mixinDir.mkdirs()
Expand Down Expand Up @@ -425,12 +458,6 @@ runClient {
def arguments = []
def jvmArguments = []

if (usesMixins.toBoolean()) {
arguments += [
"--mods=" + Paths.get("$projectDir").resolve(minecraft.runDir).normalize().relativize(Paths.get("$projectDir/build/libs/$archivesBaseName-${version}.jar"))
]
}

if(usesMixins.toBoolean() || hasMixinDeps.toBoolean()) {
arguments += [
"--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"
Expand All @@ -455,12 +482,6 @@ runServer {
def arguments = []
def jvmArguments = []

if (usesMixins.toBoolean()) {
arguments += [
"--mods=" + Paths.get("$projectDir").resolve(minecraft.runDir).normalize().relativize(Paths.get("$projectDir/build/libs/$archivesBaseName-${version}.jar"))
]
}

if (usesMixins.toBoolean() || hasMixinDeps.toBoolean()) {
arguments += [
"--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"
Expand Down Expand Up @@ -602,11 +623,29 @@ task devJar(type: Jar) {

task apiJar(type: Jar) {
from (sourceSets.main.allSource) {
include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
if (apiPackage)
include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
if (apiPackages)
apiPackages.tokenize(';').forEach { pkg ->
include modGroup.toString().replaceAll("\\.", "/") + "/" + pkg.toString().replaceAll("\\.", "/") + '/**'
}
if (apiPackagesNoRecurse)
apiPackagesNoRecurse.tokenize(';').forEach { pkg ->
include modGroup.toString().replaceAll("\\.", "/") + "/" + pkg.toString().replaceAll("\\.", "/") + '/*'
}
}

from (sourceSets.main.output) {
include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
if (apiPackage)
include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
if (apiPackages)
apiPackages.tokenize(';').forEach { pkg ->
include modGroup.toString().replaceAll("\\.", "/") + "/" + pkg.toString().replaceAll("\\.", "/") + '/**'
}
if (apiPackagesNoRecurse)
apiPackagesNoRecurse.tokenize(';').forEach { pkg ->
include modGroup.toString().replaceAll("\\.", "/") + "/" + pkg.toString().replaceAll("\\.", "/") + '/*'
}
}

from (sourceSets.main.resources.srcDirs) {
Expand All @@ -627,7 +666,7 @@ compileJava.dependsOn(copySrgs)
artifacts {
archives sourcesJar
archives devJar
if(apiPackage) {
if(apiPackage || apiPackages || apiPackagesNoRecurse) {
archives apiJar
}
}
Expand Down Expand Up @@ -670,6 +709,8 @@ def getCredentials = {
}

//Publishing
tasks.publish.dependsOn(build)

publishing {
publications {
maven(MavenPublication) {
Expand All @@ -681,7 +722,7 @@ publishing {
artifact source: sourcesJar, classifier: "sources"
}
artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
if (apiPackage) {
if (apiPackage || apiPackages || apiPackagesNoRecurse) {
artifact source: apiJar, classifier: "api"
}

Expand Down Expand Up @@ -753,7 +794,7 @@ if (curseForgeProjectId != "" && System.getenv("CURSEFORGE_TOKEN") != null) {
addGameVersion project.minecraft.version
addGameVersion "Forge"
mainArtifact(jar) {
displayName = "$modName version: $modVersion"
displayName = "$modName $modVersion"
}
}
options {
Expand All @@ -775,7 +816,7 @@ if (curseForgeProjectId != "" && System.getenv("CURSEFORGE_TOKEN") != null) {
}

if (usesMixins.toBoolean()) {
addCurseForgeRelation("requiredDependency", "gasstation")
addCurseForgeRelation("requiredDependency", "unimixins")
}
tasks.curseforge.dependsOn(build)
tasks.publish.dependsOn(tasks.curseforge)
Expand Down Expand Up @@ -808,7 +849,7 @@ if (modrinthProjectId != "" && System.getenv("MODRINTH_TOKEN") != null) {
}
}
if (usesMixins.toBoolean()) {
addModrinthDep("required", "project", "cdeAhgfp")
addModrinthDep("required", "project", "ghjoiQAl")
}
tasks.modrinth.dependsOn(build)
tasks.publish.dependsOn(tasks.modrinth)
Expand Down Expand Up @@ -993,6 +1034,10 @@ configure(deobfParams) {
description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}

// Dependency Deobfuscation

def deobfMaven(mavenDep) {
Expand Down Expand Up @@ -1067,7 +1112,7 @@ def deobf(String sourceURL, String rawFileName) {
}

download.run {
src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
src "https://github.com/FalsePattern/ExampleMod1.7.10/raw/main/blobs/BON2-2.5.1.jar"
dest bon2File
quiet true
overwrite false
Expand All @@ -1081,7 +1126,7 @@ def deobf(String sourceURL, String rawFileName) {
}

exec {
commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
commandLine Paths.get(System.getProperty("java.home"), "bin", "java").toAbsolutePath().toString(), '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
workingDir bon2Dir
standardOutput = new FileOutputStream("${deobfFile}.log")
}
Expand Down
4 changes: 1 addition & 3 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ dependencies {
implementation ("codechicken:codechickenlib-mc1.7.10:1.1.4-gtmega:dev")
implementation ("codechicken:notenoughitems-mc1.7.10:2.1.5-gtmega:dev")

implementation (deobf("https://mvn.falsepattern.com/gtmega_releases/gtmega/bartworks-mc1.7.10/0.6.0-gtmega/bartworks-mc1.7.10-0.6.0-gtmega.jar"))

implementation ("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
api ("gtmega:gt5u-mc1.7.10:5.30.1:dev")
implementation ("gtmega:gt5u-mc1.7.10:5.37.0-mega:dev")

implementation ("gtmega:ae2-mc1.7.10:rv3-beta.58-gtmega:dev")

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ repositoryName =
# version with a -mc prefix (groupid:artifactid-mcminecraftVersion:version:qualifier).
# For instance, the default values this example ships with would turn into com.myname:mymodid-mc1.7.10:version
# The version is determined automatically from the git version.
mavenGroupId = com.myname
mavenArtifactId = mymodid
mavenGroupId = com.dreammaster
mavenArtifactId = dreamcraft
#endregion maven

# Modrinth publishing
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/com/dreammaster/block/BlockList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,13 @@
public enum BlockList {

SandClayMix(new ModSimpleBaseBlock(new SandClayProperties(), ModTabList.ModBlocksTab)),
CallistoColdIce(new ModSimpleBaseBlock(new CallistoColdIceProperties(), ModTabList.ModBlocksTab)),
Ledox(new ModSimpleBaseBlock(new LedoxProperties(), ModTabList.ModBlocksTab)),
MysteriousCrystal(new ModSimpleBaseBlock(new MysteriousCrystalProperties(), ModTabList.ModBlocksTab)),
Mytryl(new ModSimpleBaseBlock(new MytrylProperties(), ModTabList.ModBlocksTab)),
Quantinum(new ModSimpleBaseBlock(new QuantinumProperties(), ModTabList.ModBlocksTab)),
PistonBlock(new ModSimpleBaseBlock(new PistonBlockProperties(), ModTabList.ModBlocksTab)),
BronzePlatedReinforcedStone(new ModSimpleBaseBlock(new BronzePlatedReinforcedStoneProperties(), ModTabList.ModBlocksTab)),
SteelPlatedReinforcedStone(new ModSimpleBaseBlock(new SteelPlatedReinforcedStoneProperties(), ModTabList.ModBlocksTab)),
TitaniumPlatedReinforcedStone(new ModSimpleBaseBlock(new TitaniumPlatedReinforcedStoneProperties(), ModTabList.ModBlocksTab)),
TungstensteelPlatedReinforcedStone(new ModSimpleBaseBlock(new TungstensteelPlatedReinforcedStoneProperties(), ModTabList.ModBlocksTab)),
NaquadahPlatedReinforcedStone(new ModSimpleBaseBlock(new NaquadahPlatedReinforcedStoneProperties(), ModTabList.ModBlocksTab)),
NeutroniumPlatedReinforcedStone(new ModSimpleBaseBlock(new NeutroniumPlatedReinforcedStoneProperties(), ModTabList.ModBlocksTab)),
BlackPlutonium(new ModSimpleBaseBlock(new BlackPlutoniumProperties(), ModTabList.ModBlocksTab)),
Charcoal(new ModSimpleBaseBlock(new CharcoalProperties(), ModTabList.ModBlocksTab)),
CompressedCharcoal(new ModSimpleBaseBlock(new CompressedCharcoalProperties(), ModTabList.ModBlocksTab)),
CompressedCoal(new ModSimpleBaseBlock(new CompressedCoalProperties(), ModTabList.ModBlocksTab)),
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/dreammaster/creativetab/ModTabList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,16 @@ private ModTabList() {}

public static void InitModTabs(CreativeTabsManager pTabManager, ModItemManager pItemManager)
{
pTabManager.AddCreativeTab(new ModCreativeTab(ModGenericTab, ItemList.AsteroidsStoneDust.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModGenericTab, ItemList.SandDust.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModShapesTab, ItemList.ShapeBlock.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModMoldsTab, ItemList.MoldFormAnvil.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModThaumcraftTab, ItemList.ChargedVoidWandCap.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModCircuitsTab, ItemList.QuantumCircuit.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModCircuitsTab, ItemList.RawLapotronCrystal.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModFluidsTab, Items.bucket));
pTabManager.AddCreativeTab(new ModCreativeTab(ModBlocksTab, Item.getItemFromBlock(Blocks.stone)));
pTabManager.AddCreativeTab(new ModCreativeTab(ModSpaceTab, ItemList.HeavyDutyNoseConeTier3.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModSolarTab, ItemList.EnrichedNaquadriaNeutroniumSunnariumAlloy.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModBarsAndCasingsTab, ItemList.ChromeBars.Item.getConstructedItem()));
pTabManager.AddCreativeTab(new ModCreativeTab(ModAdditionsToGregTechTab, ItemList.EtchedLudicrousVoltageWiring.Item.getConstructedItem()){
pTabManager.AddCreativeTab(new ModCreativeTab(ModAdditionsToGregTechTab, ItemList.CokeOvenBrick.Item.getConstructedItem()){
@Override
public void displayAllReleventItems(List stuffToShow) {
//casing adder
Expand Down
Loading
Loading