Skip to content

Commit

Permalink
Merge pull request #5 from Platymemo/quilt-1.19
Browse files Browse the repository at this point in the history
test
  • Loading branch information
Sunconure11 authored Oct 8, 2022
2 parents c42e539 + b7335be commit 2cd6a69
Show file tree
Hide file tree
Showing 249 changed files with 5,903 additions and 5,558 deletions.
39 changes: 12 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# Alaska Native Craft

## Setup

For setup instructions please see the [fabric wiki page](https://fabricmc.net/wiki/tutorial:setup) that relates to the
IDE that you are using.

## License

Creative Commons Zero v1.0 Universal
Expand All @@ -15,42 +10,32 @@ As with the Unlicense and typical software licenses, CC0 disclaims warranties.

### Mobs

1. Harp Seal
1. Seal
2. Ptarmigan
3. Moose
4. Dogsleds

### Items

1. Respective meats for each Mob
2. Muktuk
1. Ulu
2. Berries
3. Harpoons
- Combine with a lead in an anvil for long-range leashing (up to 48 blocks)
4. Dogsleds
5. Dyeable Kuspuks
6. Snow Goggles
7. Mukluks
8. Snowshoes
9. Driftwood, Antlers, and Ivory
- Replace sticks with these items in a crafting recipe to enhance the durability of the crafted item!

### Blocks

1. Whale Meat Block

### Other

1. Snowball Chickens or Parrots to make them Ptarmigans!

## Upcoming Features

### Content

1. Whales
- Whale hunting
- On Death: Corpse floats to surface to be harvested
- Whale oil (fuel source)
2. Walruses
- Walrus tusk
- Walrus tools?
3. Make Whale Meat Blocks act like Mushroom Blocks
4. Change dogsled control scheme?
2. Bushes
3. Drying Rack
- Dry strips of fish into dry fish, or rotten flesh into leather!

## Thanks

A special thanks to Daimons for the Moose Texture and to everybody in The Fabric Project Discord Server
A special thanks to Daimons for the Moose Texture
43 changes: 23 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
plugins {
id 'fabric-loom' version '0.11-SNAPSHOT'
id "com.matthewprenger.cursegradle" version "1.4.0"
id "com.modrinth.minotaur" version "1.2.1"
id 'maven-publish'
alias libs.plugins.quilt.loom
}

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group
Expand All @@ -26,24 +23,28 @@ repositories {

dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
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
}
modImplementation libs.quilt.loader
modImplementation libs.quilted.fabric.api

// Mod Menu integration
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"

// REI integration
modImplementation "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"

// We have to manually override the version of Architectury used by REI to run on Quilt
modLocalRuntime "dev.architectury:architectury-fabric:${project.architectury_override_version}"

// ClothConfig
modApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") {
exclude(group: "net.fabricmc.fabric-api")
}

// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.
}
Expand All @@ -53,14 +54,16 @@ loom {
}

processResources {
inputs.property "version", project.version
inputs.property "version", project.mod_version

filesMatching("fabric.mod.json") {
expand "version": project.version
filesMatching('quilt.mod.json') {
expand "version": project.mod_version
}
}

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

Expand Down Expand Up @@ -106,10 +109,10 @@ task publishModrinth (type: TaskModrinthUpload) {
versionNumber = "${project.mod_version}"
uploadFile = remapJar
changelog = new File("markdown/versions/${project.mod_version}.md").getText('UTF-8')
addGameVersion('1.19')
addDependency('fabric-api', Dependency.DependencyType.REQUIRED)
addGameVersion('1.19.2')
addDependency('qsl', Dependency.DependencyType.REQUIRED)
addDependency('cloth-config', Dependency.DependencyType.REQUIRED)
addLoader('fabric')
addLoader('quilt')
}

curseforge {
Expand All @@ -121,12 +124,12 @@ curseforge {
changelogType = 'markdown'
changelog = file("markdown/versions/${project.mod_version}.md")
releaseType = 'release'
addGameVersion "1.19"
addGameVersion "1.19.2"
addGameVersion "Java 17"
addGameVersion "Fabric"
addGameVersion "Quilt"
relations {
requiredDependency 'cloth-config'
requiredDependency 'fabric-api'
requiredDependency 'qsl'
optionalDependency 'modmenu'
}

Expand Down
177 changes: 177 additions & 0 deletions codeformat/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
<property name="charset" value="UTF-8"/>
<property name="fileExtensions" value="java"/>
<property name="localeLanguage" value="en"/>
<property name="localeCountry" value="US"/>
<property name="tabWidth" value="4"/>

<module name="NewlineAtEndOfFile"/>

<!-- disallow trailing whitespace -->
<module name="RegexpSingleline">
<property name="format" value="\s+$"/>
<property name="message" value="trailing whitespace"/>
</module>

<!-- note: RegexpMultiline shows nicer messages than Regexp, but has to be outside TreeWalker -->
<!-- disallow multiple consecutive blank lines -->
<module name="RegexpMultiline">
<property name="format" value="\n[\t ]*\r?\n[\t ]*\r?\n"/>
<property name="message" value="adjacent blank lines"/>
</module>

<!-- disallow blank after { -->
<module name="RegexpMultiline">
<property name="format" value="\{[\t ]*\r?\n[\t ]*\r?\n"/>
<property name="message" value="blank line after '{'"/>
</module>

<!-- disallow blank before } -->
<module name="RegexpMultiline">
<property name="format" value="\n[\t ]*\r?\n[\t ]*\}"/>
<property name="message" value="blank line before '}'"/>
</module>

<!-- require blank after } in the same indentation level -->
<module name="RegexpMultiline">
<!-- \n<indentation>}\n<same indentation><whatever unless newline, '}' or starting with cas(e) or def(ault)> -->
<property name="format" value="(?&lt;=\n)([\t]+)\}\r?\n\1(?:[^\r\n\}cd]|c[^\r\na]|ca[^\r\ns]|d[^\r\ne]|de[^\r\nf])"/>
<property name="message" value="missing blank line after block at same indentation level"/>
</module>

<!-- disallow blank line before <p> tag -->
<module name="RegexpMultiline">
<property name="format" value="(?&lt;=\n)([\t ]+\*)\r?\n\1 &lt;p&gt;"/>
<property name="message" value="blank line before &lt;p&gt;"/>
</module>

<module name="TreeWalker">
<!-- Allow "//CHECKSTYLE.OFF: <InspectionName>" and "//CHECKSTYLE.ON: <InspectionName>" pairs to toggle some inspections -->
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
<property name="checkFormat" value="$1"/>
</module>

<!-- Ensure all imports are ship shape -->
<module name="AvoidStarImport"/>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>

<module name="ImportOrder">
<property name="groups" value="java,javax,*,com.mojang.blaze3d,net.minecraft,org.quiltmc"/>
<property name="ordered" value="false"/><!-- the plugin orders alphabetically without considering separators.. -->
<property name="separated" value="true"/>
<property name="option" value="top"/>
<property name="sortStaticImportsAlphabetically" value="true"/>
</module>

<!-- Ensures braces are at the end of a line -->
<module name="LeftCurly"/>
<module name="RightCurly"/>

<!-- single line statements on one line, -->
<module name="NeedBraces">
<property name="tokens" value="LITERAL_IF,LITERAL_FOR,LITERAL_WHILE"/>
<property name="allowSingleLineStatement" value="true"/>
</module>
<module name="NeedBraces">
<property name="tokens" value="LITERAL_ELSE,LITERAL_DO"/>
<property name="allowSingleLineStatement" value="false"/>
</module>

<module name="EmptyLineSeparator">
<property name="allowNoEmptyLineBetweenFields" value="true"/>
<property name="allowMultipleEmptyLines" value="false"/>
<!-- exclude METHOD_DEF and VARIABLE_DEF -->
<property name="tokens" value="PACKAGE_DEF,IMPORT,STATIC_IMPORT,CLASS_DEF,INTERFACE_DEF,ENUM_DEF,STATIC_INIT,INSTANCE_INIT,CTOR_DEF"/>
</module>

<module name="OperatorWrap"/>
<module name="SeparatorWrap">
<property name="tokens" value="DOT,ELLIPSIS,AT"/>
<property name="option" value="nl"/>
</module>
<module name="SeparatorWrap">
<property name="tokens" value="COMMA,SEMI"/>
<property name="option" value="eol"/>
</module>

<module name="Indentation">
<property name="basicOffset" value="4"/>
<property name="caseIndent" value="4"/>
<property name="throwsIndent" value="4"/>
<property name="arrayInitIndent" value="4"/>
<property name="lineWrappingIndentation" value="8"/>
</module>

<module name="ParenPad"/>
<module name="NoWhitespaceBefore"/>
<module name="NoWhitespaceAfter">
<!-- allow ARRAY_INIT -->
<property name="tokens" value="AT,INC,DEC,UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,ARRAY_DECLARATOR,INDEX_OP"/>
</module>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround">
<!-- Allow PLUS, MINUS, MUL, DIV as they may be more readable without spaces in some cases -->
<property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV_ASSIGN,DO_WHILE,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>

<property name="allowEmptyConstructors" value="true" />
<property name="allowEmptyMethods" value="true" />
<property name="allowEmptyTypes" value="true" />
<property name="allowEmptyLoops" value="true" />
<property name="allowEmptyLambdas" value="true" />
</module>
<module name="SingleSpaceSeparator"/>
<module name="GenericWhitespace"/>
<module name="CommentsIndentation"/>

<module name="ArrayTypeStyle"/>
<module name="DefaultComesLast">
<property name="skipIfLastAndSharedWithCase" value="true"/>
</module>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>

<module name="ModifierOrder"/>
<module name="RedundantModifier"/>

<module name="AnnotationLocation"/>
<module name="MissingOverride"/>

<!-- By default, this allows catch blocks with only comments -->
<module name="EmptyCatchBlock"/>

<!-- Require the use of the "this" keyword -->
<module name="RequireThis">
<property name="validateOnlyOverlapping" value="false"/>
</module>

<!-- Enforce tabs -->
<module name="RegexpSinglelineJava">
<property name="format" value="^\t* ([^*]|\*[^ /])"/>
<property name="message" value="non-tab indentation"/>
</module>

<!-- Enforce <p> tag on its own line -->
<module name="RegexpSinglelineJava">
<property name="format" value="&lt;p&gt;[^\r\n]+"/>
<property name="message" value="&lt;p&gt; not on its own line"/>
</module>

<module name="OuterTypeFilename"/>
<module name="PackageDeclaration"/>

<module name="InvalidJavadocPosition"/>
<module name="JavadocBlockTagLocation"/>
<module name="JavadocContentLocation"/>
<module name="JavadocStyle"/>
<module name="AtclauseOrder">
<property name="tagOrder" value="@param,@return,@throws,@deprecated"/>
</module>
</module>
</module>
17 changes: 6 additions & 11 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.19
yarn_mappings=1.19+build.4
loader_version=0.14.8
org.gradle.parallel = true

# Mod Properties
mod_version=1.4.6
mod_version=1.4.7
maven_group=com.github.platymemo
archives_base_name=alaskanativecraft

# Dependencies
fabric_version=0.56.3+1.19
clothconfig_version=7.0.72
modmenu_version=4.0.0
rei_version=9.0.493
clothconfig_version=8.0.75
modmenu_version=4.0.6
rei_version=9.1.550
architectury_override_version=6.2.46
22 changes: 22 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[versions]
# The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
minecraft = "1.19.2"
quilt_mappings = "1.19.2+build.3"
quilt_loader = "0.17.5-beta.2"

quilted_fabric_api = "4.0.0-beta.13+0.62.0-1.19.2"

[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.+" }
Loading

0 comments on commit 2cd6a69

Please sign in to comment.