Skip to content

Commit

Permalink
feat: Tier 1 Apparatus (Ore Refining) (#132)
Browse files Browse the repository at this point in the history 
* feat: add calcination oven block

* feat: add calcination oven block entity

* feat: add calcination oven menu

* docs: update CHANGELOG.md for beta/v1.19.2-1.1.0 [skip ci]

* chore: update compatibility matrix for curseforge publishing

* chore: reduce minimim required forge version

* chore: update mod version for local builds

* docs: update CHANGELOG.md for beta/v1.19.2-1.1.1 [skip ci]

* feat: add calcination oven block

* feat: add calcination oven block entity

* feat: add calcination oven menu

* fix: variable name

* fix: usage of right serializer for divination rod recipe

* feat: add calcination recipe serializer

* start working on menu provider

we actually should move away from menus though ..

* feat: add (temporary) higher tier divination rods

* docs: update CHANGELOG.md for beta/v1.19.2-1.2.0 [skip ci]

* fix: check for contract violating null item stacks as recipe results

Closes #71

* docs: update CHANGELOG.md for beta/v1.19.2-1.2.1 [skip ci]

* feat: keep divination rod at 0 durability until next full scan

this allows using the rod to find existing search results

* docs: update CHANGELOG.md for beta/v1.19.2-1.3.0 [skip ci]

* chore: improve calcination oven model json

* chore: for now fix (read: ignore) compiler error

* feat: add pyromantic brazier

* chore: rename package

* chore: improve brazier

* fix: calcination oven model

* remove menu from calcination oven, we'll use a in-world interaction

based scheme from now on

* fix: block entity registration

* chore: remove no longer existing menu

* feat: add brazier funcftionality

* feat: add campfire optics to brazier

also switch to a template based approach where the blockbench output is used only as parent, but the textures etc are set via child from datagen

* chore: switch calcination oven to template based model approach

* chore: rework calcination oven

* chore: switch calcination oven logic over to the separate invs

* feat: start working on calcination recipes

* salty salt (#63)

* Update empty_jar.png

* salt

---------

Co-authored-by: Kli Kli <[email protected]>

* fix: restore icon

* feat: set up first alchemical salt item

* fix: alchemical salt render

* chore: working on JEI

* feat: improve calcination jei rendering

* feat: switch to new calcination oven model

* fix: calcination processing

* fix: post-merge fixes

* fix: textures

* chore: update oven voxelshape

* feat: add block loot

* feat: liquefaction cauldron (#78)

* feat: add liquefaction cauldron

* feat: add block loot for cauldron

* feat: add cauldron block entity

* feat: add sal ammoniac solvent fluid

* chore: add comment

* feat: add fluid tag for solvent

refactor tag registration and tag datagen

* chore: prefix children of forge datagens with "Theurgy"

* chore: move datagen classes into proper packages

* chore: refactor packages

* feat: add fluid ingredient and fluid tag empty condition

* chore: switch calcination recipes to fully custom recipe type

* chore: refactor heat consumption into mixin interface

* chore:  remove unnecessary experience todo

* chore: remove (likely) unnecessary ingredient check

* feat: add liquefaction recipe and processing in the cauldron

* chore: remove outdated comment

* feat: add almostunified integration

* feat: add sulfur source support for tags

* fix: crash due to mixin in dependency

* fix: renamed methods

* fix: ingredient and condition serializer registration

* fix: add ore salt to creative tabs

* feat: add liquefaction JEI category (WIP)

* fix: Adjust div rod default tiers to match recipes

* feat: convert calcination jei category to new render system

* feat: convert (unfinished) liquefaction jei category to new render system

* feat: add liquefaction recipe provider

* chore: improve recipe generation

reduce use of raw strings to identify objects

* fix: recipe generator folders

* fix: calcination recipe background size

* feat: add fluid handling to liquefaction jei category

* feat: new liquefaction cauldron model

* chore: streamline insert/extract behaviour

* fix: fluid tank saving

* feat: add fluit input/output handling to cauldron block

* chore: refactor custom cached check

* chore: automatic setChanged when appropriate

* feat: add cauldron liquid rendering

* feat: add block interaction entry (#80)

Closes #75

* feat: rework alchemical sulfur #1

* feat: add linked block tag support to divination rod

* fix: divination rod name / tooltip rendering

- fix formatting
- show error message in component if unknown block is linked

* feat: autogenerate sulfur source if not present in recipe result nbt

* feat: auto-generate sulfur lang

* feat: auto-generate sulfur models

* feat: auto-register sulfurs to creative tab if they have a recipe

* fix: alchemical sulfur rendering

* chore: move divination rod stages to subfolder

* feat: add functionality to liquefaction recipe provider

* chore: remove brackets from linked block in tooltip

to match rendering of sulfur source in tooltips

* feat: start adding animated distiller block

* fix: switch to new bucket model loader

* feat: continue adding distiller block

* feat: add distillation recipe

* chore: disable smoke particles

* feat: add jei category for distillation

* feat: add input count requirement to distillation recipe

* fix: correct usage of output inventory

also adjust progress/total time var names to be unified over all blocks

* fix: provide correct (new) recipe type for burn duration

* feat: add recipe handling and input functionality to distiller

* chore: comment custom recipe check

* fix: allow inserting ingredient amounts below recipe minimum

* fix: improve crafting done check stability

* chore: refactor block interactions

* feat: add mercury crystal item

* fix: remove light from the devices

* feat: add incubator blocks with test models

* chore: remove unnecessary if

* fix: only update lit value if property is present

* feat: add tags for salts, sulfurs and mercuries

also streamline salt registration

* feat: add incubator block entities

* chore: refactor interaction interfaces

* feat: add interaction to incubator blocks

* chore: improve recipe generation

* chore: refactor alchemical salt

* feat: add incubation recipe

* feat: add incubation jei category

* chore: refactor

* fix: incubation jei sulfur rendering

* chore: safeguard against mixing up sulfur and salt in incubation recipe gen

* chore: update comments to reflect functionality

* feat: add incubator crafting

* feat: update calcination oven texture

* feat: add spagyrics modonomicon pages (#100)

* chore: update to latest modonomicon

* feat: add spagyrics category and link entry to it

* feat: add some utility to book category providers

* feat: add three principles entry

* feat: add crafting recipe datagen

* feat: add (empty) entries for machines

* feat: add more utility to the provider mixin interfaces

* feat: improve brazier entry

* feat: add multiblock datagen

* fix: divination rod t2 recipe

* feat: add duplicate define exception

* feat: switch to modonomicon multiblock provider

* feat: add multiblock pages for apparti

* feat: add liquefaction page

chore: improve apparatus how to page

* chore: update to latest modonomicon

* chore: make lang cat provider more generic

* feat: update to 1.19.4

* feat: more spagyrics texts

* feat: sal ammoniac production


chore: add hotswap params for JBR


feat: sal ammoniac tank block entity functionality


feat: sal ammoniac accumulator block entity functionality


feat: enable jei


feat: add ingredient codecs


feat: add accumulator recipes


chore: make namespace name conform to convention


chore: remove unnecessary stack handler creation


feat: add validation of accumulator input based on recipe


fix: recipe provider name 


feat: add accumulation recipe provider


fix: npe if no solute is present


feat: add jei category for accumulation recipes


feat: add sal ammoniac items


feat: add sal ammoniac recipe from crystal


chore: fix reuse compliance


feat: add ore worldgen


feat: add sal ammoniac recipe processing in accumulator


chore: simplify crafting code & auto reformat


feat: add solvent entry

also add item link helper function

feat: add lazy multiblock checking 

handles first multiblock check after loading into a world gracefully

feat: add buckets to jei recipe lookup for their contained fluids


feat: add accumulation recipe modonomicon renderer (part 1)


chore: update to latest versions

to access new modonomicon fluid rendering

feat: add accumulation recipe modonomicon renderer (part 2)


chore: add missing licensing statements and update some content to CC0-1.0

* feat: add modonomicon recipe renderers (#105)

* chore: update to latest forge

* chore: update to latest jei

* feat: add calcination recipe page

* chore: move into subpackages

* feat: add distillation recipe page

* feat: add liquefaction recipe page

* feat: add incubation recipe page

* feat: add recipes to craft appartus

Closes #95

* feat: improve tooltips

Closes #88

* chore: update to new particle registration method

* chore: stop using deprecated onUsingTick, instead use onUseTick

* fix: do not consume rod durability in creative mode

Closes #102

* chore: move recipe utility classes into subpackages

* feat: add ore based materials

feat: add mercury recipes for ores and raw materials

chore: add tag not empty conditions

feat: add salt for ingots

chore: rebrand ore and ingot salts to "mineral"

fix: consume actual ingredient count not just 1

feat: add ingredient count to calcination

chore: add output counts to ore liquefaction recipes

fix: add tag not empty condition to incubation recipe provider

chore: add strata salt -> mineral salt recipe and ingedient count handling to recipe provider

chore: run datagen

feat: add strata salt recipes

feat: add ore/raw sulfur -> ingot recipes

fix: raw iron liquefaction

feat: add helper to get missing sulfur nbt

chore: make jei exclude unused sulfurs from rendering in tag ingredients

chore: make modonomicon exclude unused sulfurs from rendering

also use the new render helpers for ingredients with count so we don't need our own

chore: set required minimum modonomicon version

chore: update liquefaction provider to use sulfur as input instead of string

chore: remove comments

feat: unify mineral sulfurs (no more ores vs raw vs ingots)

feat: Add tags for abundant and common metals

This commit adds tags for abundant and common metals to the TheurgyItemTagsProvider. Copper is added to the ALCHEMICAL_SULFURS_METALS_ABUNDANT tag, while several metals including iron, tin, zinc, lead, nickel, cinnabar and osmium are added to the ALCHEMICAL_SULFURS_METALS_COMMON tag.

* feat: add animated calcination oven




feat: make distiller model file datagenned

feat: add model files and datagen for new calcination oven

feat: add animated calcination oven renderer

fix: stop anim

Closes #110

Co-authored-by: xjammuux <[email protected]>

* feat: add sulfur source name rendering based on lang file (#112)

Closes #109

* feat: Add liquefaction recipes for other common minerals

* feat: add liquefaction recipes for gems

* feat: add tier tags for materials

Closes #114

* feat: add sal ammoniac cycle

* feat: allow divination rods to find blocks in same tag

and fix not finding any results if a block does not have a deepslate equivalent

* Merge remote-tracking branch 'origin/version/1.19.4' into develop

* fix: divination rod JEI recipes not showing if IE and NERB are both present

* chore: update mdk to 1.20.0

* feat: update code to 1.20

* feat: show geckolib items from perspective instead of flat in inv

Closes #116

* fix: use Empty Registry access instead of null

* fix: geckolib item render perspective as world entity

* fix: machine outputs

* feat: add more mercury recipes

* feat: increase incubator model size to 2 blocks

* feat: update to 1.20.1

* feat: reenable AU integration

* feat: make blocks higher than one block into doublehalf blocks (#125)

* feat: make calcination oven use double block

* chore: use forge registry in au integration

* fix: calcination oven

* feat: make distiller use double block

* feat: make liquefaction cauldron use double block

* feat: make incubator use double block

* chore: make incubator interaction output only

* chore: migrate from mixin to composition for item handling

* chore: address all deprecation warnings (fix, or in case of mojang api, suppress)

* chore: autoformat

* feat: switch to using modonomicon category providers

* feat: use a wrapper to prevent inserting into output inventories via capability

* chore: set fields private if they were package private without reason

* feat: improve calcination oven on anim

* chore: switch to new publish plugin that supports modrinth

* feat: make calcination oven show if it is working with anim

* chore: rename package

* chore: rename var

* feat: introduce crafting behaviour for calcination oven

* chore: move class

* feat: add distiller crafting behaviour and processing anim

* chore: refactor particles

* feat: add bubbles to cauldron

* feat: make cauldron use crafting behaviour

* chore: refactor to use fluid handler instead of fluid tank (more generic)

* chore: rename variable

* feat: make accumulator use crafting behaviour

* feat: add updated hollow accumulator model

* feat: add status visuals to accumulator

* feat: make incubator use crafting behaviour

* feat: add a few more calcination recipes

* feat: add isProcessing visuals (smoke) to incubator

* fix: book links that lead to wrong cat

* feat: add image pages to show when apparatus are working

* chore: refactor heat consumer to be composition instead of inheritance

* feat: make calcination oven use animationbehaviour

* feat: make distiller use animationbehaviour

* chore: refactor behaviour variables

* feat: sulfur based divination rods

* fix: sulfur attuned rod tag handling

* feat: add additional sulfur based rods and improve tooltips

* fix: sulfur creative tab registration

* feat: add subtype handling for sulfur to show all options in jei

* feat: add amethyst divination rod

* feat: add book pages on new rods

Close #121

* chore: rename packages

* feat: book progress conditions

* chore: update to 1.20.1 parchment mappings

* chore: disable conditions for now, fallbackto auto

Advancement based conditions will be a future feature because they need modonomicon improvements

* chore: use method instead of field

* feat: set recipes to return isSpecial -> true to avoid vanilla log warnings

* chore: move entries to sub provider for organization

* feat: add first entry for refining

* fix: divination rod entry link

* fix: page spacing

* feat: add next refining page

* chore: some renaming and refactoring

* chore: run datagen

* feat: update to latest modonomicon and use new convenience features

* feat: update to latest modonomicon

* feat: add more entries about ore refining

* feat: add mercury entry and more mercury recipes

* feat: add incubation entry

* feat: update feature overview

* feat: update to latest modonomicon

* feat: update licensing links for maven

* feat: add new incubator and vessel models

Closes #90

* feat: add new sal ammoniac tank model

* feat: improve model rendering

* feat: add fluid rendering to sal ammoniac tank

Closes #131

* feat: update recipes for incubator, incubator vessels and tank

* fix: remove render experiments from incubator

* feat: switch to cloudsmith maven

* chore: cleanup github action

* docs: update link

* feat: update modonomicon

* chore: update jei version rage

* chore: refactor package structure

* chore: autoformat

* chore: fastforward changelog to 1.20.1

---------

Co-authored-by: klikli-dev <[email protected]>
Co-authored-by: xjammuux <[email protected]>
  • Loading branch information
@klikli-dev @xjamiex
3 people authored Jul 22, 2023
1 parent c8fb01c commit 11dd51b
Show file tree
Hide file tree
Showing 830 changed files with 29,770 additions and 1,548 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/build_and_publish.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,18 @@ jobs:
uses: gradle/gradle-build-action@v2
with:
arguments: build
gradle-home-cache-cleanup: true
env:
MOD_VERSION: ${{ steps.get_version.outputs.result }}
MINECRAFT_VERSION: ${{ steps.get_mc_version.outputs.result }}
GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
- name: Publish
uses: gradle/gradle-build-action@v2
with:
arguments: publish
gradle-home-cache-cleanup: true
env:
MAVEN_USER: ${{ secrets.MAVEN_USER }}
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
MOD_VERSION: ${{ steps.get_version.outputs.result }}
MINECRAFT_VERSION: ${{ steps.get_mc_version.outputs.result }}
- name: Update CHANGELOG
id: changelog
uses: klikli-dev/changelog-action@main
Expand Down Expand Up @@ -96,7 +95,6 @@ jobs:

files: |
build/libs/theurgy-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}.jar
build/libs/theurgy-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}-sources.jar
name: theurgy-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}.jar
version: ${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}
Expand Down
19 changes: 1 addition & 18 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [beta/v1.20.1-1.3.10] - 2023-07-22
### :sparkles: New Features
- [`15f3d29`](https://github.com/klikli-dev/theurgy/commit/15f3d29338092e027670949d9f3259abead5b5af) - update modonomicon *(commit by [@klikli-dev](https://github.com/klikli-dev))*

### :wrench: Chores
- [`7cc05c1`](https://github.com/klikli-dev/theurgy/commit/7cc05c1f64c759021883077593b0c3f0991abf8f) - update jei version rage *(commit by [@klikli-dev](https://github.com/klikli-dev))*


## [beta/v1.20.1-1.3.9] - 2023-07-22
### :sparkles: New Features
- [`a194764`](https://github.com/klikli-dev/theurgy/commit/a19476437b60c83787b50bb88b7147341c431d5c) - switch to cloudsmith maven *(commit by [@klikli-dev](https://github.com/klikli-dev))*
Expand Down Expand Up @@ -221,13 +213,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[beta/v1.19.4-1.3.0]: https://github.com/klikli-dev/theurgy/compare/beta/v1.19.4-.0.0.0...beta/v1.19.4-1.3.0
[beta/v1.19.4-1.3.1]: https://github.com/klikli-dev/theurgy/compare/beta/v1.19.4-1.3.0...beta/v1.19.4-1.3.1
[beta/v1.19.4-1.3.2]: https://github.com/klikli-dev/theurgy/compare/beta/v1.19.4-1.3.1...beta/v1.19.4-1.3.2
[beta/v1.19.4-1.3.3]: https://github.com/klikli-dev/theurgy/compare/beta/v1.19.4-1.3.2...beta/v1.19.4-1.3.3
[beta/v1.19.4-1.3.4]: https://github.com/klikli-dev/theurgy/compare/beta/v1.19.4-1.3.3...beta/v1.19.4-1.3.4
[beta/v1.19.4-1.3.5]: https://github.com/klikli-dev/theurgy/compare/beta/v1.19.4-1.3.4...beta/v1.19.4-1.3.5
[beta/v1.20-1.3.5]: https://github.com/klikli-dev/theurgy/compare/beta/v1.20-0.0.0...beta/v1.20-1.3.5
[beta/v1.20.1-1.3.5]: https://github.com/klikli-dev/theurgy/compare/beta/v1.20.1-0.0.0...beta/v1.20.1-1.3.5
[beta/v1.20.1-1.3.6]: https://github.com/klikli-dev/theurgy/compare/beta/v1.20.1-1.3.5...beta/v1.20.1-1.3.6
[beta/v1.20.1-1.3.7]: https://github.com/klikli-dev/theurgy/compare/beta/v1.20.1-1.3.6...beta/v1.20.1-1.3.7
[beta/v1.20.1-1.3.8]: https://github.com/klikli-dev/theurgy/compare/beta/v1.20.1-1.3.7...beta/v1.20.1-1.3.8
[beta/v1.20.1-1.3.9]: https://github.com/klikli-dev/theurgy/compare/beta/v1.20.1-1.3.8...beta/v1.20.1-1.3.9
[beta/v1.20.1-1.3.10]: https://github.com/klikli-dev/theurgy/compare/beta/v1.20.1-1.3.9...beta/v1.20.1-1.3.10
[beta/v1.19.4-1.3.3]: https://github.com/klikli-dev/theurgy/compare/beta/v1.19.4-1.3.2...beta/v1.19.4-1.3.3
304 changes: 0 additions & 304 deletions LICENSES/LGPL-3.0-only.txt
View file

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ confidence.

Copyright 2022 klikli-dev

Code is licensed under the MIT license, view [LICENSES/MIT](./LICENSES/MIT.txt).
Assets are licensed under the CC-BY-SA-4.0 license, view [LICENSES/CC-BY-SA-4.0](./LICENSES/CC-BY-4.0.txt).
Third party software and assets may be distributed under a different license, see [THIRD_PARTY_NOTICES.md](./THIRD_PARTY_NOTICES.md).
Code is licensed under the MIT license, view [LICENSES/MIT](./LICENSES/MIT.txt).
Assets are licensed under the CC-BY-SA-4.0 license, view [LICENSES/CC-BY-SA-4.0](./LICENSES/CC-BY-4.0.txt).
Third party software and assets may be distributed under a different license, see [THIRD_PARTY_NOTICES.md](./THIRD_PARTY_NOTICES.md).
44 changes: 40 additions & 4 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,17 @@ minecraft {
// Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
property 'forge.logging.console.level', 'debug'

//Fix for mixin refmap crash (in our case for AU)
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
property 'forge.enabledGameTestNamespaces', 'theurgy'

// enable using JBR to hotswap MOAR
// also ignore the option if someone isnt using JBR
jvmArgs '-XX:+AllowEnhancedClassRedefinition', '-XX:+IgnoreUnrecognizedVMOptions'

mods {
"${mod_id}" {
source sourceSets.main
Expand All @@ -60,8 +68,16 @@ minecraft {

property 'forge.logging.console.level', 'debug'

//Fix for mixin refmap crash (in our case for AU)
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

property 'forge.enabledGameTestNamespaces', 'theurgy'

// enable using JBR to hotswap MOAR
// also ignore the option if someone isnt using JBR
jvmArgs '-XX:+AllowEnhancedClassRedefinition', '-XX:+IgnoreUnrecognizedVMOptions'

mods {
"${mod_id}" {
source sourceSets.main
Expand All @@ -79,6 +95,10 @@ minecraft {

property 'forge.logging.console.level', 'debug'

//Fix for mixin refmap crash (in our case for AU)
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

property 'forge.enabledGameTestNamespaces', 'theurgy'

mods {
Expand All @@ -95,6 +115,10 @@ minecraft {

property 'forge.logging.console.level', 'debug'

//Fix for mixin refmap crash (in our case for AU)
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"

// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
args '--mod', 'theurgy', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')

Expand All @@ -118,10 +142,18 @@ repositories {
}
}
maven {
name = "JEI"
name = "JEI and AlmostUnified"
url = 'https://maven.blamejared.com/'
content {
includeGroup "mezz.jei"
includeGroup "com.almostreliable.mods"
}
}
maven {
name = 'GeckoLib'
url = 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/'
content {
includeGroup "software.bernie.geckolib"
}
}
}
Expand All @@ -139,6 +171,12 @@ dependencies {
compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")

//almostunified
implementation fg.deobf("com.almostreliable.mods:almostunified-forge:${minecraft_version}-${almost_unified_version}")

//Geckolib
implementation fg.deobf("software.bernie.geckolib:geckolib-forge-${geckolib_minecraft_version}:${geckolib_version}")

//modonomicon
compileOnly fg.deobf("com.klikli_dev:modonomicon-${minecraft_version}-common:${modonomicon_version}")
implementation fg.deobf("com.klikli_dev:modonomicon-${minecraft_version}-forge:${modonomicon_version}")
Expand Down Expand Up @@ -180,7 +218,7 @@ publishing {
url = 'https://github.com/klikli-dev/theurgy'
licenses {
license {
name = 'MIT License'
name = 'MIT AND CC-BY-4.0'
url = 'https://github.com/klikli-dev/theurgy#licensing'
}
}
Expand Down Expand Up @@ -216,5 +254,3 @@ afterEvaluate {
options.compilerArgs << "-Xmaxerrs" << "2000"
}
}

processResources.setDuplicatesStrategy(DuplicatesStrategy.WARN)
12 changes: 9 additions & 3 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,19 @@ group=com.klikli_dev
mod_id=theurgy
mod_name=Theurgy
mod_license=MIT AND CC-BY-4.0
mod_version=1.3.8
mod_version=1.4.0
mod_authors=Kli Kli
mod_description=An open-source magic mod built around classical alchemy to replicate and transmute matter, and create magical artifacts.

## Dependency Properties

jei_version=15.2.0.22
jei_version=15.2.0.23
jei_version_range=[15.2.0.0,)
modonomicon_version=1.38.5
modonomicon_version_range=[1.38.1,)
modonomicon_version_range=[1.38.1,)
almost_unified_version=0.5.0
almost_unified_version_range=[0.5.0,)
# geckolib currently names their files after 1.20
geckolib_minecraft_version=1.20
geckolib_version=4.2
geckolib_version_range=[4.2,)
4 changes: 4 additions & 0 deletions src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// 1.20.1 2023-06-14T18:13:30.5425607 Registries
b9dc44db0143205750319e6a0e908376bc98d251 data/theurgy/forge/biome_modifier/add_sal_ammoniac_ore.json
eed8cd1911e09af63a869a86d83ab846401194f9 data/theurgy/worldgen/configured_feature/sal_ammoniac_ore.json
3983ae18720546d5efb83e7ac1aa81c774492d63 data/theurgy/worldgen/placed_feature/sal_ammoniac_ore.json
7 changes: 7 additions & 0 deletions src/generated/resources/.cache/36b27e4a9e87bb9edde2c7e0abd4798ee5ccadb9
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// 1.20.1 2023-06-28T18:41:54.6848695 Multiblocks: theurgy
063aa91958795c57f58083ca62e775e9476a9407 data/theurgy/modonomicon/multiblocks/placement/calcination_oven.json
c480adc4c7baf9ba5321c4ee48193369676f8762 data/theurgy/modonomicon/multiblocks/placement/distiller.json
b9d8372529ac674469f93113632ad36c34e3a053 data/theurgy/modonomicon/multiblocks/placement/incubator.json
40277a7901437bd284fc57eedf1a0c3376bf0712 data/theurgy/modonomicon/multiblocks/placement/liquefaction_cauldron.json
9ecbb6214a85f4e42d664e0e4c320d4deaa4ecd6 data/theurgy/modonomicon/multiblocks/placement/pyromantic_brazier.json
d58572d664b1efc48e0e520dbc6aec93b700341e data/theurgy/modonomicon/multiblocks/placement/sal_ammoniac_accumulator.json
38 changes: 33 additions & 5 deletions src/generated/resources/.cache/3fa62e6e7a071b2d9f296990c67d7a2df0006913
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,34 @@
// 1.20.1 2023-06-16T15:33:23.1735098 Books: theurgy
// 1.20.1 2023-07-20T16:49:53.4033832 Books: theurgy
ead61475fc866f8eb903a6d99236808a0383fd5a data/theurgy/modonomicon/books/the_hermetica/book.json
3a4b111882abf1b08df5ba3159faf2cab89f3c3e data/theurgy/modonomicon/books/the_hermetica/categories/getting_started.json
28ae6dbc76158bf163aa0d3ca564f6158642ef69 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/about_mod.json
18c55d191c21c11592ff7e80c4f7d98ab1fbfab9 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/divination_rod.json
40b96909739d7276b24a3549b02d3c78f5008ef1 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/intro.json
6397585a0c454daf7ca44fdfcd96a0fe11081905 data/theurgy/modonomicon/books/the_hermetica/categories/getting_started.json
1629a778e477590cb0efd667e8b859d3b665c84c data/theurgy/modonomicon/books/the_hermetica/categories/spagyrics.json
210cf9c37c3c0294b58f4a54b7c4e93025792b74 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/about_divination_rods.json
d76d5e184a4d9f7793add0d1b3d00b689cf9eb68 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/about_mod.json
49a641fb5a0f49d9aa0bf09ac3f3f400783f1ab9 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/about_ore_refining.json
f93531b8ed5951cf0cc730321045b436d9f9a7b2 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/abundant_and_common_sulfur_attuned_divination_rod.json
6ea2baa437e4b966e76cb7ba36edf7e0466a2e06 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/amethyst_divination_rod.json
29077029775d026fad0c79b57320ec8b42877600 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/apparatus_how_to.json
2398259d45dbe9c7c82ff71b4b2f2e34638f1e71 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/create_mercury.json
102429754a637746618440e77060ee738e230726 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/create_salt.json
7c386d3ea0e927e5414ba7871366bb0471c63844 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/create_solvent.json
50218e2b0cc8ad7fe319ccc6bb24577ec33e69dd data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/create_sulfur.json
4757ca66842869fc4dcb41d3df9214a3b410390e data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/incubation.json
e12436dfc3cebdeaef7d4881f36adec2f77c93e7 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/intro.json
c954d5a48200ef468d779a25abc6e06d5839c42b data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/needed_apparatus.json
28e0f6620e5c9679a3440a315d588a92110c4ab8 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/precious_sulfur_attuned_divination_rod.json
80e03ad70c4c628c0910c7b63ae7fa7b3e4795d9 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/rare_sulfur_attuned_divination_rod.json
b57cfb886c90c850b98f3ad4da495632ddceffef data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/spagyrics.json
5eab1c1c7a4b3e4c45167a00afcb12f4259389f2 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/spagyrics_link.json
a6e91d27d58bde11ef2077b6b2d557901453d9c0 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/t1_divination_rod.json
1d531a62ba91279909e7baf234c889bed9daec8b data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/t2_divination_rod.json
a34621a80190e5984fa2a5cc4f2ffbeaf5eeae7d data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/t3_divination_rod.json
2c63fd1bb0a8b1d76e5a33bbac35b2412db13c55 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/t4_divination_rod.json
606565ad971b369b2ee9c4123e7b2d2a3df7062e data/theurgy/modonomicon/books/the_hermetica/entries/spagyrics/about_ore_refining_link.json
0c2e406c34f44e354a043e9134fbca21b5f235a0 data/theurgy/modonomicon/books/the_hermetica/entries/spagyrics/calcination_oven.json
87248cfd462acc7b6cddfd81b0bee9dac357801b data/theurgy/modonomicon/books/the_hermetica/entries/spagyrics/distiller.json
c5f51b786bfc5c7a7803362acde27cfba40b1107 data/theurgy/modonomicon/books/the_hermetica/entries/spagyrics/incubator.json
583a601b3829afee551c1cf53eb72a37db7176d2 data/theurgy/modonomicon/books/the_hermetica/entries/spagyrics/intro.json
d3b133f22a814c94248deec0e585fc9c43228179 data/theurgy/modonomicon/books/the_hermetica/entries/spagyrics/liquefaction_cauldron.json
331cba56f57b89d6ecbf894b01af825e50e108d9 data/theurgy/modonomicon/books/the_hermetica/entries/spagyrics/principles.json
385ca34ac424c982fe951a36bbf2063af212639b data/theurgy/modonomicon/books/the_hermetica/entries/spagyrics/pyromantic_brazier.json
8a14684d4563cf8f4ba7212e7f5b19fcc8e2db48 data/theurgy/modonomicon/books/the_hermetica/entries/spagyrics/solvents.json
16 changes: 16 additions & 0 deletions src/generated/resources/.cache/444362c84684b9346bb4ad16fb33ed185ef17ccc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// 1.20.1 2023-06-19T13:35:19.3019162 Calcination Recipes
77aaf59ed4e959adc3d5ff35577b9c1af13ffde0 data/theurgy/recipes/calcination/crops.json
91ce7283a5d8bf210f825e1c7f3899c840caa238 data/theurgy/recipes/calcination/mineral.json
2c2a45ef208781a281ba2aa635752a2f7471e871 data/theurgy/recipes/calcination/mineral_from_gems.json
a5cbe077c2033e01d36194645de8d0bf1f6f2fe0 data/theurgy/recipes/calcination/mineral_from_ingots.json
318a5ed36db7c407466c1e9742dc61e4f8765a96 data/theurgy/recipes/calcination/mineral_from_ores.json
9d67c0f1d86b52ffaae734811734ac70a7ba4370 data/theurgy/recipes/calcination/mineral_from_other_minerals.json
e86404797d860ec34b10f879af93c72c918f391d data/theurgy/recipes/calcination/mineral_from_raw_materials.json
ba195891125b128d161451e25dbb074953885711 data/theurgy/recipes/calcination/strata_from_clay.json
cca77a84bbe10e2025dbb21013c98da6622b1a6f data/theurgy/recipes/calcination/strata_from_clay_ball.json
b2f66c8002d24f641587f9807d9f0c99b5db0a47 data/theurgy/recipes/calcination/strata_from_cobblestone.json
6b1de9114f62125e92b14b80c789afc47db95a2d data/theurgy/recipes/calcination/strata_from_dirt.json
e867a7fc92a15c664a74efd17f663b1e1a97590f data/theurgy/recipes/calcination/strata_from_gravel.json
40b9c77832ad8a7da93f8d58899b67d7daadae40 data/theurgy/recipes/calcination/strata_from_sand.json
d8c4c5d9875cf9c50d24fcbcf19c0c735dbd6fe4 data/theurgy/recipes/calcination/strata_from_sandstone.json
ca4f676293c126a473b34a97b7d2cd69167c4d28 data/theurgy/recipes/calcination/strata_from_stone.json
Loading

0 comments on commit 11dd51b

Please sign in to comment.