Commit Graph

246 Commits

Author SHA1 Message Date
Max
93dd95c6a0 Merge branch '1.19' into 1.19.2 2023-02-06 18:01:55 +01:00
Max
b4cf77dde9 Merge branch '1.18.2' into 1.19 2023-02-06 18:01:10 +01:00
desht
1524550146 Add PlayerEvent.ATTACK_ENTITY (#380)
[ci skip]

* Add PlayerEvent.ATTACK_ENTITY
* Fired from Forge's AttackEntityEvent and Fabric's AttackEntityCallback
* When player is about to attack any entity (not just living) with left-click
* javadoc parameter alignment
* import cleanup
2023-02-06 17:53:43 +01:00
Max
96f3dc6f9c Buildscript updates, use fabric-api dependency in fmj 2022-12-08 18:10:18 +01:00
shedaniel
709ca7535c Merge remote-tracking branch 'architectury/1.19' into 1.19.2 2022-11-23 01:46:01 +08:00
shedaniel
e8177b3075 Merge remote-tracking branch 'architectury/1.18.2' into 1.19 2022-11-23 01:43:22 +08:00
Juuz
ec9cb04ebc Fix Loom 1.0 removals (#348)
* Replace loom.forge.localMods with loom.mods

* Replace javax annotations with jetbrains

[norelease]
2022-11-20 00:33:48 +01:00
shedaniel
b0f0a04c50 Merge remote-tracking branch 'architectury/1.19' into 1.19.2
# Conflicts:
#	gradle.properties
2022-10-23 01:06:20 +08:00
shedaniel
108ac16ce5 Merge remote-tracking branch 'architectury/1.18.2' into 1.19 2022-10-23 01:03:00 +08:00
Max
382e6b0bf0 Fix crash with EntityEvent.LIVING_CHECK_SPAWN on Forge (#345)
* Fix crash with EntityEvent.LIVING_CHECK_SPAWN on Forge

* Fix whitespace

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

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
2022-10-23 01:02:47 +08:00
shedaniel
d26471de0e [ci skip] Fix #340 (#341) 2022-10-23 01:02:39 +08:00
Max
6a9d61aa42 Merge branch '1.19' into 1.19.2 2022-09-11 19:04:48 +02:00
Max
dbf7ee25c8 Use correct event bus for key mapping registry on Forge 2022-09-11 19:02:55 +02:00
Juuxel
0978e58bb6 Prevent running on 1.19.1+ (#325) 2022-08-22 19:59:01 +08:00
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
Max
4c280e7d8c Fix toString on RegistryEntryId (used in logging), make it a record 2022-08-07 21:58:32 +02: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
Max
a7d31393a0 Fix ParticleProviderRegistry not working properly on Forge, add Javadocs (#305)
* Fix ParticleProviderRegistry not working properly on Forge, add Javadocs

Based on https://github.com/architectury/architectury-api/pull/196#issuecomment-1200268981, supersedes #196

* Update testmod, fix bounds on deferred register

* Warn when registering particles too late on Forge
2022-07-31 18:48:38 +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
Max
2f5d4444c8 Fix Item pickup not being cancellable on Forge (#301)
(cherry picked from commit 128141a99d)
2022-07-22 20:07:36 +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
Max
128141a99d [ci skip] Fix Item pickup not being cancellable on Forge (#301) 2022-07-20 23:22:38 +08:00
shedaniel
216556bab6 Fix #294 2022-07-14 22:03:52 +08:00
shedaniel
37c5c7d1fe Fix Support for 41.0.94 (#295)
* Fix Support for 41.0.94

* Bump to 5.9
2022-07-12 17:19:53 +08:00
shedaniel
fe632a10bd Fix Support for 41.0.64 (#292)
* Update to Forge 41.0.64

* Bump to 5.8
2022-07-08 23:03:30 +08:00
shedaniel
6952fec6ee Update mods.toml 2022-06-16 18:46:05 +08:00
shedaniel
f8fc466c39 Merge remote-tracking branch 'architectury/1.18.2' into 1.19 2022-06-16 18:45:21 +08:00
shedaniel
17735f090b Update Forge mods.toml automatically 2022-06-16 18:44:54 +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
a997cd44c1 Fix #278 (#281) 2022-06-15 19:46:43 +08: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