Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Luke100000/minecraft-comes-alive
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7.5.2+1.19.2
Choose a base ref
...
head repository: Luke100000/minecraft-comes-alive
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.20.1
Choose a head ref
Loading
Showing 1,205 changed files with 51,391 additions and 25,683 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@ jobs:
env:
MODRINTH_TOKEN: ${{ secrets.MR_API_TOKEN }}
CURSEFORGE_TOKEN: ${{ secrets.CF_API_TOKEN }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
if: startsWith(github.ref, 'refs/tags/')
steps:
- name: Checkout Commit
@@ -21,11 +23,8 @@ jobs:
run: chmod +x gradlew
- name: Build Artifacts with Gradle
run: ./gradlew build
- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: artifacts
path: ./build/libs/
- name: Publish to Maven
run: ./gradlew publish
- name: Get tag
if: ${{ success() && startsWith(github.ref, 'refs/tags/') }}
id: tag
@@ -36,7 +35,7 @@ jobs:
separator: "+"
msg: ${{steps.tag.outputs.tag}}
- name: "Upload to Distributors"
uses: Kir-Antipov/mc-publish@v3.1
uses: Kir-Antipov/mc-publish@v3.3.0
if: ${{ success() && startsWith(github.ref, 'refs/tags/') }}
with:
modrinth-id: 1W98a849
11 changes: 0 additions & 11 deletions .github/workflows/pr_gradle.yml
Original file line number Diff line number Diff line change
@@ -16,14 +16,3 @@ jobs:
run: ./gradlew :forge:build
- name: Build with Gradle - Fabric
run: ./gradlew :fabric:build
- name: Upload Artifacts - Forge
uses: actions/upload-artifact@v2
with:
name: forge_artifacts
path: ./forge/build/libs/
- name: Upload Artifacts - Fabric
uses: actions/upload-artifact@v2
with:
name: fabric_artifacts
path: ./fabric/build/libs/

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ out
*.iws
*.iml
.idea
*.env

# gradle
build
94 changes: 46 additions & 48 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,92 +1,90 @@
plugins {
id 'java-library'
id 'architectury-plugin' version '3.4-SNAPSHOT'
id 'dev.architectury.loom' version '0.12.0-SNAPSHOT' apply false
id "io.github.pacifistmc.forgix" version "1.2.6"
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false
id "io.github.pacifistmc.forgix" version "1.2.9"
}

architectury {
minecraft = rootProject.minecraft_version
}

def getAppVersion = { ->
try {
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'describe', '--tags', '--abbrev=0'
standardOutput = stdout
}
return stdout.toString().trim()
} catch (Exception e) {
println "Warning: ${e.message}, is git installed?"
return "dev"
}
} as Object


subprojects {
apply plugin: 'dev.architectury.loom'

dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
}

build.finalizedBy(mergeJars)
assemble.finalizedBy(mergeJars)
}


def getAppVersion = { ->
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = stdout
}
def commitId = stdout.toString().replace("\n", "").replace("\r", "").trim()
stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'tag', '--points-at', commitId
standardOutput = stdout
}
def tagName = stdout.toString().replace("\n", "").replace("\r", "").trim()
def versionName = '0-git-' + commitId
if (tagName != null && "" != tagName) {
versionName = tagName
}
return versionName
} as Object

allprojects {
apply plugin: "architectury-plugin"

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
apply plugin: "maven-publish"
apply plugin: 'architectury-plugin'

group = rootProject.group
group = rootProject.groupId
description = rootProject.displayname
archivesBaseName = rootProject.name
version = getAppVersion()

tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.release = 17
}
build.finalizedBy(mergeJars)
assemble.finalizedBy(mergeJars)

java {
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

tasks.withType(JavaCompile).configureEach {
it.options.release = 17
}

publishing {
repositories {
maven {
name = "reposiliteRepository"
url = uri("https://maven.conczin.net/Artifacts")
credentials {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_TOKEN")
}
}
}
}
}

forgix {
group = rootProject.group
group = rootProject.groupId
mergedJarName = "${rootProject.name}-${rootProject.version}-universal.jar"
outputDir = "build/libs"

forge {
jarLocation = "build/libs/${rootProject.name}-${rootProject.version}-forge.jar"
jarLocation = "build/libs/${rootProject.name}-${rootProject.version}.jar"
mixin "mca.mixin.json"
}

fabric {
jarLocation = "build/libs/${rootProject.name}-${rootProject.version}-fabric.jar"
jarLocation = "build/libs/${rootProject.name}-${rootProject.version}.jar"
}

quilt {
jarLocation = "build/libs/${rootProject.name}-${rootProject.version}-quilt.jar"
jarLocation = "build/libs/${rootProject.name}-${rootProject.version}.jar"
}
}
158 changes: 158 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,160 @@
# 7.6.1

* Fixed crash on Forge

# 7.6.0

* Added cribs, a lot of cribs, in all colors and woods
* Some gift registry updates
* Destiny now supports structure tags
* Fixed compatibility issues with Productive Bees
* Renamed names data dir to avoid conflicts

# 7.5.22

* Fixed Library Auth once again.
* Fixed Steve skins being converted to Steve skins again.

# 7.5.21

* Fixed Library Auth when updating from older version

# 7.5.20

* Fixed Library Auth

# 7.5.19

* Fixed trait shaders
* Rose gold dust is no longer part of the gold dust group to remove conflicts
* Fixed incompatibility with Productive Bees
* Added experimental long term memory to ChatAI
* Hopefully fixed crashes
* Villagers no longer grieve at single graves
* Villager can now glow while invisible
* You can now whistle villagers when they sit in vehicles
* Height now affects Hemoglobin levels
* Villagers no longer jump in front of gates

# 7.5.18

* Updated contributor book
* Fixed ReaperSpawner eating all your CPU

# 7.5.17

* Now its compatible with Cobblemon!
* Fixed TTS again!

# 7.5.16

* Fixed issues with building jars

# 7.5.15

* Merged [Inworld integration](https://github.com/Luke100000/minecraft-comes-alive/wiki/GPT3-based-conversations)
branch (thanks CSCMe!)
* Fixed incompatibility with Cobblemon (thanks Apion!)
* Fixed AI issues with Grim Reapers, causing him to go much higher than intended
* Fixed issues when using Arabic numerals
* Fixed crashes when using TTS
* Fixed Inn spamming adventurers
* Probably fixed deadlocks related to SpawnQueue and ReaperSpawner
* Fixed incompatibility with AutoTranslation and related mods

# 7.5.14

* TTS language is now detected automatically

# 7.5.13

* Updated chatAI to v2
* See https://github.com/Luke100000/minecraft-comes-alive/wiki/GPT3-based-conversations
* Older versions will no longer work, technical reasons
* Added TTS v2
* See https://github.com/Luke100000/minecraft-comes-alive/wiki/TTS

# 7.5.12

* Fixed various smaller issues
* Personalities now have a few more phrases
* Fixed harvest task not dropping items
* Set workplace no longer messes up trades

# 7.5.11

* Fixed a crash

# 7.5.10

* Fixed data loading issues on systems with locales having non-western digits.
* Villagers no longer harvest blocks in claimed regions
* Added support for Let's Do Bakery
* Fixed root advancement to appear on world load
* Fixed villager marriage limit math
* You can no longer restrict bells or gravestones, causing them to get stuck
* Vanilla player models no longer modify your eye height
* Player eye height now automatically refreshes on world join and editor changes
* The editor now tells you if an incompatible mod disabled custom models
* Removed vanilla mechanics for turning villagers into zombie villagers as this causes undefined behavior
* Added HSV hair color option to editor
* Added loot tables in case mods rely on them and let zombie villagers drop some flesh

# 7.5.9

* Wrong procreation cooldown on new worlds

# 7.5.8

* AI performance improvements
* Dropped babies in the inventory no longer end up in the backrooms
* Inverted marriage slider as this is more what people expect
* Fixed large players receiving damage on the ceiling
* Married adventurers no longer despawn
* Added a procreation cooldown (3 in-game days by default)
* Added attack-text cooldown
* Fixed trait influenced gender preferences
* Added gender override config flag for players

# 7.5.7

* Fixed a crash

# 7.5.6

* Added missing loot tables for some headstones

# 7.5.5

* Fixed server crash

# 7.5.4

* Removed size requirements of blueprint buildings
* Restored C2ME compatibility
* Fixed drunk behavior at fence gates when smart fence AI is disabled (which it is by default)
* Fixed marriage slider not being saved
* Fixed fallback translations on 1.19.4+
* Added morph to the list of don't-render-custom-arms-when-installed list
* You can no longer squish babies on the ceiling
* Archers can now equip crossbows
* The camera height is now correct
* Added the ancient city as a rumor and starting location
* Female cultists now also wear robes
* Skin library now has...
* Much less data transfer
* A report system
* Filter buttons for hair and clothing
* Hopefully less connection issues thanks to a dedicated domain
* Global skins now actually work

# 7.5.3

* Ported to 1.20
* Invalid skins are now hidden by default in the Skin Library
* Added even more sanity checks when uploading stuff
* Fixed father/mother at baby item not always being correct

# 7.5.2

* Removed gold dust
@@ -118,6 +275,7 @@
* Fixed a lag spike and improved overall village performance
* Synced Patrons list
* Fixed wrong baby name when placing from creative
* Fixed 1.19.3 on Forge

# 7.4.0 rc 1, 2

28 changes: 22 additions & 6 deletions common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
architectury {
common rootProject.enabled_platforms.split(',')
}

dependencies {
modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury:${rootProject.architectury_version}"
// We depend on Fabric Loader here to use the Fabric @Environment annotations,
// which get remapped to the correct annotations on each platform.
// Do NOT use other classes from Fabric Loader.
modImplementation "net.fabricmc:fabric-loader:$rootProject.loader_version"

// Architectury API. This is optional, and you can comment it out if you don't need it.
modImplementation "dev.architectury:architectury:$rootProject.architectury_version"
}

architectury {
common(rootProject.enabled_platforms.split(","))
}

publishing {
publications {
mavenCommon(MavenPublication) {
artifactId = rootProject.artifactId
groupId = rootProject.groupId
version = version + "+common"
from components.java
}
}
}
Loading