Commit Graph

271 Commits

Author SHA1 Message Date
shedaniel
fd6a654868 Merge remote-tracking branch 'architectury/1.19' into 1.19.2
# Conflicts:
#	gradle.properties
2022-08-11 19:07:54 +08:00
shedaniel
19d1d7f55a Merge remote-tracking branch 'architectury/1.18.2' into 1.19
# Conflicts:
#	gradle.properties
2022-08-11 19:07:26 +08:00
shedaniel
3ee2355b2d [ci skip] Add LiquidBlock.arch$getFluid and fix MixinFoodPropertiesBuilder (#316) 2022-08-11 19:05:55 +08:00
shedaniel
ab80a6a77f Revert "[ci skip] Add LiquidBlock.arch$getFluid and fix MixinFoodPropertiesBuilder (#314)" (#315)
This reverts commit 21bed670de.
2022-08-11 19:04:34 +08:00
shedaniel
21bed670de [ci skip] Add LiquidBlock.arch$getFluid and fix MixinFoodPropertiesBuilder (#314) 2022-08-11 19:03:55 +08:00
shedaniel
8cefb7797a Merge remote-tracking branch 'architectury/1.19' into 1.19.2
# Conflicts:
#	gradle.properties
2022-08-08 18:06:15 +08:00
shedaniel
f584b0b991 Merge remote-tracking branch 'architectury/1.18.2' into 1.19
# Conflicts:
#	gradle.properties
2022-08-08 18:05:54 +08:00
shedaniel
739359e5b2 Add simple interface injection extensions (#257)
* Add simple interface injection extensions
* Update to only add holders for intrusive registry entries
* Add arch$registryName

[ci skip]
2022-08-07 16:01:46 +02:00
Max
2f150cf819 Add more validation to NetworkManagerImpl (#310)
[ci skip]
2022-08-07 16:01:06 +02:00
shedaniel
64c1f05efa Update to 1.19.2 2022-08-06 10:16:49 +08:00
shedaniel
432581096e Update to 1.19.1 (#302)
* Update to 1.19.1

* Make it compile

* Update to 1.19.1

* Set 1.19.1 as the publishing version

(cherry picked from commit b316dde8ba)
2022-08-06 10:06:35 +08:00
shedaniel
1c98573c5f Revert "Update to 1.19.1 (#302)"
This reverts commit b316dde8ba.
2022-08-06 10:05:43 +08:00
Max
6624dbe295 Merge branch '1.18.2' into 1.19 2022-07-31 18:59:43 +02:00
shedaniel
b316dde8ba Update to 1.19.1 (#302)
* Update to 1.19.1

* Make it compile

* Update to 1.19.1

* Set 1.19.1 as the publishing version
2022-07-28 19:45:57 +08:00
itsmeow
81f4de28ba Implement hasTag onto BiomeContext (#272)
* Implement hasTag onto BiomeContext
* Improve optional handling

[norelease] to allow for version bumping and reformatting before release

(cherry picked from commit 16a7d23602)
2022-07-23 03:08:43 +08:00
Juuxel
6b83a15e81 [ci skip] Add loot table modification event (#287)
* Add loot table modification event

Closes #42. It's a simple wrapper around the platform events.

* Add param for builtin loot tables

Co-authored-by: shedaniel <daniel@shedaniel.me>

(cherry picked from commit f0555ce0eb)
2022-07-23 03:00:07 +08:00
Juuxel
f0555ce0eb [ci skip] Add loot table modification event (#287)
* Add loot table modification event

Closes #42. It's a simple wrapper around the platform events.

* Add param for builtin loot tables

Co-authored-by: shedaniel <daniel@shedaniel.me>
2022-07-20 23:22:47 +08:00
shedaniel
f8fc466c39 Merge remote-tracking branch 'architectury/1.18.2' into 1.19 2022-06-16 18:45:21 +08:00
shedaniel
a22b7fc18d Publish jars with the loader suffix, fix testmod-common circular dependency 2022-06-16 18:39:47 +08:00
Max
192d3a9d26 Merge branch '1.18.2' into 1.19 2022-06-16 12:03:36 +02:00
Max
7d86eba267 Implement Forge's new Fluid API (#280)
* (Untested) fixes for the new Forge Fluid API
* Migrate ArchitecturyFlowingFluid to FluidTypes
* Add overlay textures, fix compile issues
* Fix Supplier import
* Add FluidState variant of get texture and color methods
* Deprecate combined render properties getter in favour of separate stack- and state-aware getters
* Add overlay texture override to SimpleArchitecturyFluidAttributes
* Update common/src/main/java/dev/architectury/core/fluid/ArchitecturyFluidAttributes.java

Co-authored-by: shedaniel <daniel@shedaniel.me>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>

[norelease]
2022-06-16 11:59:08 +02:00
shedaniel
146fe8b8b9 Add stack-aware CraftingRemainingItem (#277)
* Add stack-aware CraftingRemainingItem
* Add JavaDocs

[norelease]
2022-06-16 11:58:10 +02:00
shedaniel
aec32d5f42 Migrate to Unified Publishing (#274)
[norelease] to avoid empty release

* Migrate to Unified Publishing

* Proper changelog md

* Edit workflow

(cherry picked from commit 547f06f45e)
2022-06-14 00:00:53 +02:00
shedaniel
547f06f45e Migrate to Unified Publishing (#274)
* Migrate to Unified Publishing

* Proper changelog md

* Edit workflow
2022-06-13 00:56:07 +08:00
Max
78ec6761a0 Reformat and cleanup merged PR, bump minor version 2022-06-09 19:49:07 +02:00
itsmeow
16a7d23602 Implement hasTag onto BiomeContext (#272)
* Implement hasTag onto BiomeContext
* Improve optional handling

[norelease] to allow for version bumping and reformatting before release
2022-06-09 19:47:34 +02:00
shedaniel
c77f040c21 Update to 1.19 2022-06-08 21:35:41 +08:00
Max
551edceb82 Clean up BlockEntityHooks
Signed-off-by: Max <maxh2709@gmail.com>
2022-06-08 13:40:10 +02:00
Max
c870ccab83 Remove most deprecated features marked for removal in previous versions
Signed-off-by: Max <maxh2709@gmail.com>
2022-06-08 13:17:21 +02:00
shedaniel
f7947ecbdf Update to 1.19-pre3 2022-05-29 17:22:42 +08:00
shedaniel
d13267a721 Merge remote-tracking branch 'architectury/1.18.2' into 1.19
# Conflicts:
#	fabric/build.gradle
#	forge/build.gradle
#	gradle.properties
2022-05-29 16:59:22 +08:00
Max
3b8b9049e0 Fix Platform#getFilePath not returning the *root* file path on Forge (#269)
* Platform#getFilePath now actually returns the *root* path on forge

Signed-off-by: Max <maxh2709@gmail.com>

* Add Mod#findResource (please stop yelling at me now kthx)

Signed-off-by: Max <maxh2709@gmail.com>
2022-05-28 11:54:44 +02:00
Max
517205efdc Add Platform#getFilePaths (#268)
Signed-off-by: Max <maxh2709@gmail.com>
2022-05-27 17:31:05 +02:00
shedaniel
42684fd87a Add way for other mods to indicate that they are fake players (#202)
* Add way for other mods to indicate that they are fake players

* Implement "reasonable default" for fake players and fix inverted logic

Signed-off-by: Max <maxh2709@gmail.com>

Co-authored-by: Max <maxh2709@gmail.com>
2022-05-26 20:15:30 +02:00
Max
7abfd95e7b Add quilt to list of supported loaders (thanks to @wafflecoffee for confirming!)
[ci skip]

Signed-off-by: Max <maxh2709@gmail.com>
2022-05-22 19:49:42 +02:00
Max
5d4a8d9506 Add rudimentary support for modrinth publishing (#263)
(cherry picked from commit 4da029729c)
Signed-off-by: Max <maxh2709@gmail.com>
2022-05-22 18:36:27 +02:00
Max
4da029729c Add rudimentary support for modrinth publishing (#263)
* Add rudimentary support for modrinth publishing

Signed-off-by: Max <maxh2709@gmail.com>

* Reformat, disambiguate version number

Signed-off-by: Max <maxh2709@gmail.com>
2022-05-22 18:01:35 +02:00
shedaniel
258d23c62e Update to 1.19-pre1 2022-05-19 20:19:08 +08:00
shedaniel
0adf9a2e6d Update to 22w19a 2022-05-13 08:11:11 +08:00
shedaniel
3e4cd1f841 Merge remote-tracking branch 'architectury/1.18.2' into 1.19
# Conflicts:
#	gradle.properties
#	testmod-common/src/main/java/dev/architectury/test/item/TestBlockInteractions.java
2022-05-13 07:13:53 +08:00
Max
aa008479a1 Fix fluid testmod, add dummy init method to FluidStack (classloading 😍)
Signed-off-by: Max <maxh2709@gmail.com>
2022-05-11 00:49:36 +02:00
shedaniel
476cea2aff Make Architectury API publish to the same CF project
(cherry picked from commit b11b717671)
(cherry picked from commit a59d038a1f)
2022-05-07 22:02:38 +08:00
shedaniel
bd9b3e73e4 Add fluid block and flowing fluid (#251)
[ci skip]

Squash of the following commits:

* Add way to register fluids and fluid attributes, WIP UNTESTED
* Move to correct package
* Update forge/build.gradle
* Add bucket item wrapper and add test mod
* Make it easier to declare attributes by suppliers
* Fix fabric support
* Change SimpleArchitecturyFluidAttributes to accept Supplier<Optional<T>>
* Make ArchitecturyLiquidBlock and ArchitecturyBucketItem accept Supplier
* Update testmod
* Link javadocs in the builder to make it easier to check
* Add ArchitecturyMobBucketItem and fix caps on ArchitecturyBucketItem
* Make SimpleArchitecturyFluidAttributes accept wildcard fluids
* getContainingFluid -> getContainedFluid
* Add supplier variant of the methods

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: Max <maxh2709@gmail.com>
2022-05-06 13:51:25 +02:00
shedaniel
3532d24577 Fix some broken features and random crashes (#253)
[ci skip]
2022-05-06 13:40:02 +02:00
shedaniel
c51271bc8c Update to 22w18a 2022-05-05 18:25:23 +08:00
shedaniel
d74e5729ff Merge remote-tracking branch 'architectury/1.18.2' into 1.19
# Conflicts:
#	fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java
#	gradle.properties
2022-05-05 16:10:08 +08:00
shedaniel
ad879a803c [ci cancel] Add more fluid attributes (#247) 2022-05-02 01:41:19 +08:00
shedaniel
e901cc953f Update to 22w17a 2022-04-28 14:01:55 +08:00
shedaniel
d6a12573ab Update to 22w16b 2022-04-21 13:55:59 +08:00
shedaniel
ce779d56b8 Merge remote-tracking branch 'architectury/1.18.2' into 1.19
# Conflicts:
#	gradle.properties
2022-04-21 02:02:23 +08:00