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.

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

Full data generation + API + 1.19.4 port #16

Merged
merged 13 commits into from
Mar 24, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 10 additions & 7 deletions .github/ISSUE_TEMPLATE/block-suggestion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,29 @@ body:
- type: textarea
id: block-list
attributes:
label: List the blocks you want added to Arch-Ex.
label: List the blocks you want added to AE.
maximumpower55 marked this conversation as resolved.
Show resolved Hide resolved
description: If you are suggesting new blocktype(s), go to the next input field.
value: |
- Cobblestone columns

- type: textarea
id: new-blocktype
attributes:
label: List the blocktype(s) you want added to Arch-Ex.
description: This is where you'd put your blocktypes you want added to Arch-Ex if applicable.
label: List the blocktype(s) you want added to AE.
description: This is where you'd put your blocktypes you want added to AE if applicable.
maximumpower55 marked this conversation as resolved.
Show resolved Hide resolved
value: |
- Crown Moldings

- type: textarea
- type: checkboxes
id: blocktypes
attributes:
label: What blocktypes do your block(s) fall under if applicable.
description: Your block can fall under multiple block types if applicable.
value: |
- Column, Molding, Beam
description: You may select more than one.
options:
- label: Column Block
- label: Arch Block
- label: Post Block
- label: Beam Block

- type: textarea
id: description
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ body:
label: Logs
description: |
If applicable (crash, error output in console), please provide your crash report or latest.log
To upload logs, use [MCLogs](https://mclo.gs/) to upload your crashlog or latest.log.
To upload logs, use an external site to post the crash report, such as [Ubuntu Pastebin](https://paste.ubuntu.com/), [Pastebin](http://pastebin.com/), or [Github Gist](https://gist.github.com/)
maximumpower55 marked this conversation as resolved.
Show resolved Hide resolved
Crash reports without a crashlog or a latest.log file will be marked as invalid. Crashes are hard to fix without the crashlogs or latest.log file(s).
- type: textarea
id: context
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ blank_issues_enabled: false
contact_links:
- name: Discuss Architecture Extensions on the Discord server.
url: https://discord.gg/SN89y7EQTN
about: Discuss bug reports, suggestions or other Arch-Ex related stuff on our Discord server.
about: Discuss bug reports, suggestions or other AE related stuff on our Discord server.
maximumpower55 marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ To discuss this mod or give suggestions/feedback, join my Discord server: https:
- Azagwen for the roof block models: https://github.com/woodiertexas/architecture-extensions/pull/7
- Everyone in the Quilt Community discord for helping me with this mod.
- Crackers0106 for mod icon.

## Contributors
![contributors](https://contrib.rocks/image?repo=woodiertexas/architecture-extensions)
32 changes: 3 additions & 29 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,15 @@ version = project.version
group = project.maven_group

repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.

}

// All the dependencies are declared at gradle/libs.version.toml and referenced with "libs.<id>"
// See https://docs.gradle.org/current/userguide/platforms.html for information on how version catalogs work.
dependencies {
minecraft libs.minecraft
mappings loom.layered {
addLayer quiltMappings.mappings("org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:v2")
// officialMojangMappings() // Uncomment if you want to use Mojang mappings as your primary mappings, falling back on QM for parameters and Javadocs
}
mappings "org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:intermediary-v2"
modImplementation libs.quilt.loader

// QSL is not a complete API; You will need Quilted Fabric API to fill in the gaps.
// Quilted Fabric API will automatically pull in the correct QSL version.
modImplementation libs.quilted.fabric.api
// modImplementation libs.bundles.quilted.fabric.api // If you wish to use Fabric API's deprecated modules, you can replace the above line with this one
}

processResources {
Expand All @@ -44,45 +32,31 @@ processResources {

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
it.options.release = 17
}

java {
// Still required by IDEs such as Eclipse and Visual Studio Code
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()

// If this mod is going to be a library, then it should also generate Javadocs in order to aid with developement.
// Uncomment this line to generate them.
// withJavadocJar()
}

// If you plan to use a different file for the license, don't forget to change the file name here!
jar {
from("LICENSE") {
rename { "${it}_${archivesBaseName}" }
}
}

// Configure the maven publication
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
}
}

// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.

}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ org.gradle.jvmargs = -Xmx1G
org.gradle.parallel = true

# Mod Properties
version = 2.0.0+1.19.2
maven_group = io.github.woodiertexas
version = 1.0.0+1.19
maximumpower55 marked this conversation as resolved.
Show resolved Hide resolved
maven_group = io.github.debuggyteam
archives_base_name = architecture_extensions

# Dependencies are managed at gradle/libs.versions.toml
18 changes: 5 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
[versions]
# The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
minecraft = "1.19.2"
quilt_mappings = "1.19.2+build.14"
quilt_loader = "0.17.5-beta.2"
quilted_fabric_api = "4.0.0-beta.11+0.60.0-1.19.2"

# Stone Cutter Recipe Tags
#scrt = "3.0.1-fabric"
minecraft = "1.19.4"
quilt_mappings = "1.19.4+build.5"
quilt_loader = "0.18.6"
quilted_fabric_api = "6.0.0-beta.2+0.76.0-1.19.4"

[libraries]
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" }
quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" }

quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" }
quilted_fabric_api_deprecated = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated", version.ref = "quilted_fabric_api" }

# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
[bundles]
quilted_fabric_api = ["quilted_fabric_api", "quilted_fabric_api_deprecated"]

[plugins]
quilt_loom = { id = "org.quiltmc.loom", version = "0.12.+" }
quilt_loom = { id = "org.quiltmc.loom", version = "1.0.+" }
minotaur = { id = "com.modrinth.minotaur", version = "2.+" }
Loading