fix pondering and add cursegradle

This commit is contained in:
yuesha-yc 2021-10-24 04:20:26 -07:00
parent 161c436942
commit 5be4b42233
No known key found for this signature in database
GPG key ID: 009D79A802D4ED01
3 changed files with 33 additions and 65 deletions

View file

@ -1,6 +1,5 @@
buildscript {
repositories {
// These repositories are only for Gradle plugins, put any other repositories in the repository block further below
maven { url = 'https://maven.minecraftforge.net' }
maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
mavenCentral()
@ -11,11 +10,15 @@ buildscript {
}
}
plugins {
id 'com.matthewprenger.cursegradle' version '1.4.0'
}
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.spongepowered.mixin'
group = 'com.teammoeg'
version = '1.16.5-0.1.2'
version = '1.16.5-1.0.0'
java {
archivesBaseName = 'steampowered'
@ -23,23 +26,10 @@ java {
}
minecraft {
// The mappings can be changed at any time and must be in the following format.
// Channel: Version:
// snapshot YYYYMMDD Snapshot are built nightly.
// stable # Stables are built at the discretion of the MCP team.
// official MCVersion Official field/method names from Mojang mapping files
//
// You must be aware of the Mojang license when using the 'official' mappings.
// See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
//
// Use non-default mappings at your own risk. They may not always work.
// Simply re-run your setup task after changing the mappings to update your workspace.
mappings channel: 'official', version: '1.16.5'
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
runs {
client {
property 'mixin.env.remapRefMap', 'true'
@ -48,16 +38,8 @@ minecraft {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
// The markers can be added/removed as needed separated by commas.
// "SCAN": For mods scan.
// "REGISTRIES": For firing of registry events.
// "REGISTRYDUMP": For getting the contents of all registries.
property 'forge.logging.markers', 'REGISTRIES'
// Recommended logging level for the console
// You can set various levels here.
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
property 'forge.logging.console.level', 'debug'
mods {
@ -74,16 +56,8 @@ minecraft {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
// The markers can be added/removed as needed separated by commas.
// "SCAN": For mods scan.
// "REGISTRIES": For firing of registry events.
// "REGISTRYDUMP": For getting the contents of all registries.
property 'forge.logging.markers', 'REGISTRIES'
// Recommended logging level for the console
// You can set various levels here.
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
property 'forge.logging.console.level', 'debug'
mods {
@ -99,19 +73,10 @@ minecraft {
workingDirectory project.file('run')
// Recommended logging data for a userdev environment
// The markers can be added/removed as needed separated by commas.
// "SCAN": For mods scan.
// "REGISTRIES": For firing of registry events.
// "REGISTRYDUMP": For getting the contents of all registries.
property 'forge.logging.markers', 'REGISTRIES'
// Recommended logging level for the console
// You can set various levels here.
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
property 'forge.logging.console.level', 'debug'
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
args '--mod', 'steampowered', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
mods {
@ -123,7 +88,6 @@ minecraft {
}
}
// Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/generated/resources' }
repositories {
@ -156,9 +120,6 @@ repositories {
}
dependencies {
// Specify the version of Minecraft to use. If this is any group other than 'net.minecraft' it is assumed
// that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
minecraft 'net.minecraftforge:forge:1.16.5-36.2.2'
implementation fg.deobf("curse.maven:create-328085:3419412")
@ -170,30 +131,17 @@ dependencies {
annotationProcessor "org.spongepowered:mixin:0.8.3:processor"
testAnnotationProcessor "org.spongepowered:mixin:0.8.3:processor"
// Real mod deobf dependency examples - these get remapped to your current mappings
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
// runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
// implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
// Examples using mod jars from ./libs
// implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
// For more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
}
// Example for how to get properties into the manifest for reading at runtime.
jar {
manifest {
attributes([
"Specification-Title" : "steampowered",
"Specification-Vendor" : "YueSha",
"Specification-Vendor" : "YueSha, khjxiaogu, goumo_g",
"Specification-Version" : "1", // We are version 1 of ourselves
"Implementation-Title" : project.name,
"Implementation-Version" : project.jar.archiveVersion,
"Implementation-Vendor" : "YueSha",
"Implementation-Vendor" : "YueSha, khjxiaogu, goumo_g",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
"MixinConfigs": "steampowered.mixins.json"
])
@ -203,3 +151,20 @@ mixin {
add sourceSets.main, "steampowered.refmap.json"
}
jar.finalizedBy('reobfJar')
curseforge {
project {
def envApiKey = System.getenv('CURSEFORGE_API_KEY')
apiKey = envApiKey == null ? 'nope' : envApiKey
id = '534610' // Steam Powered
changelog = "See commit history: https://github.com/TeamMoegMC/SteamPowered/commits/master"
changelogType = 'markdown'
releaseType = 'release' // Default versions are marked release
addGameVersion "1.16.5"
mainArtifact jar
}
}

View file

@ -124,12 +124,15 @@ public class SPScenes {
scene.idle(10);
scene.world.showSection(util.select.position(enginePos.west(2)), Direction.EAST);
scene.idle(10);
scene.world.showSection(util.select.position(enginePos.east(1)), Direction.WEST);
scene.world.showSection(util.select.position(enginePos.east(1).north(1)), Direction.WEST);
scene.world.showSection(util.select.position(enginePos.east(1).above(1)), Direction.WEST);
scene.world.showSection(util.select.position(enginePos.east(1).above(2).south(1)), Direction.WEST);
scene.world.setKineticSpeed(util.select.position(enginePos.east(1).above(1)), 64.0F);
scene.world.setKineticSpeed(util.select.position(enginePos.east(1).above(2).south(1)), 32.0F);
scene.world.showSection(util.select.position(enginePos.above(1)), Direction.WEST);
scene.idle(10);
scene.world.showSection(util.select.position(enginePos.east(2)), Direction.UP);
scene.world.showSection(util.select.position(enginePos.east(2).above(1)), Direction.UP);
scene.world.showSection(util.select.position(enginePos.east(2).above(2)), Direction.UP);
scene.idle(10);
String text = flywheel ? "Flywheels are required for generating rotational force with the Steam Engine" : "Steam Engines generate Rotational Force while Steam is provided";
scene.overlay.showText(80).attachKeyFrame().placeNearTarget().pointAt(util.vector.topOf(enginePos.west(flywheel ? 3 : 1))).text(text);
scene.idle(7);

View file

@ -4,11 +4,11 @@ license = "GPLv3"
issueTrackerURL = "https://github.com/TeamMoegMC/Steam-Powered/issues"
[[mods]] #mandatory
modId = "steampowered" #mandatory
version = "1.16.5-0.1.2" #mandatory
version = "1.16.5-1.0.0" #mandatory
displayName = "Create: Steam Powered" #mandatory
authors = "YueSha, dashuaibia, duck_egg, Luyuuke"
authors = "YueSha, khjxiaogu, goumo_g"
description = '''
Steam Age with Create
Expanding Create mod to the Steam Age
'''
[[dependencies.steampowered]]
modId = "forge"