imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-30 05:05:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
599 Commits 36 Branches 0 Tags
22caa2810877d03f0653cbcd0e1ea0114fcf6dd0
Commit Graph

276 Commits

Author SHA1 Message Date
shedaniel
22caa28108 Merge remote-tracking branch 'origin/1.19.2' into 1.20 
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	fabric/src/main/java/dev/architectury/event/fabric/EventHandlerImpl.java
#	forge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java
#	gradle.properties
 2024-02-26 22:12:16 +09:00
shedaniel
a2e5359225 Add client commands 
Signed-off-by: shedaniel <daniel@shedaniel.me>
 2024-02-26 21:13:36 +09:00
shedaniel
ac1bd64350 Merge remote-tracking branch 'origin/1.19.4' into 1.20 
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	testmod-common/src/main/java/dev/architectury/test/registry/TestRegistries.java
 2024-02-06 18:11:03 +09:00
shedaniel
306e947ff7 Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistrarManagerImpl.java
 2024-02-06 18:02:41 +09:00
digitalseraphim
4ed66609b0 Make ArchitecturyFlowingFluid use the same Forge FluidType when the s… (#467) 
* Make ArchitecturyFlowingFluid use the same Forge FluidType when the same ArchitecturyFluidAttributes object is passed in

* Use the same fluid type instead of the same properties for simplity

* Fix packages import

---------

Co-authored-by: shedaniel <daniel@shedaniel.me>
 2024-02-06 17:33:01 +09:00
shedaniel
f1fdba9897 [ci skip] SpawnPlacements.register Hook (Closes architectury/architectury-api#375) (#473) 2024-02-06 17:32:50 +09:00
Josiah Glosson
a333232d85 [ci skip] Add defaultId to RegistrarBuilder (#474) 
* Add defaultId to RegistrarBuilder

* Make the default key an registrar option

---------

Co-authored-by: shedaniel <daniel@shedaniel.me>
 2024-02-06 17:32:35 +09:00
shedaniel
b26347a026 [ci skip] Add ClientTooltipComponentRegistry for custom tooltips (#475) 
* Add ClientTooltipComponentRegistry for custom tooltips (#463)

Signed-off-by: Sergey Shatunov <me@aur.rocks>
Signed-off-by: shedaniel <daniel@shedaniel.me>

* Fix testmod for client tooltip components

Signed-off-by: shedaniel <daniel@shedaniel.me>

---------

Signed-off-by: Sergey Shatunov <me@aur.rocks>
Signed-off-by: shedaniel <daniel@shedaniel.me>
Co-authored-by: Sergey Shatunov <me@aur.rocks>
 2024-02-06 17:32:25 +09:00
shedaniel
8b1bd40f54 Mark 1.20.1 as compatible 2023-07-09 17:48:46 +08:00
shedaniel
7f7807469b Merge remote-tracking branch 'architectury/1.19.4' into 1.20 
# Conflicts:
#	fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java
#	forge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java
#	forge/src/main/resources/META-INF/mods.toml
#	gradle.properties
 2023-07-09 17:42:36 +08:00
shedaniel
bac9421615 Fix tooltip color event (#412) 
* Fix color tooltip event

* Make it final
 2023-07-09 17:35:18 +08:00
秋 雨落
b523f05f53 Update mods.toml to 1.20 (#410) 2023-06-12 15:53:06 +08:00
shedaniel
091ec41143 Fix LootTableModificationContextImpl log spam (hopefully) 2023-06-08 14:36:04 +08:00
shedaniel
82505652eb Update to 1.20 and support Forge 2023-06-08 12:49:18 +08:00
shedaniel
863ba5ced9 Update to 23w18a 2023-05-09 02:17:27 +08:00
shedaniel
9a6a6f2ed3 Use setSpawnCancelled 2023-03-25 16:21:56 +08:00
shedaniel
e5e00a952c Support latest Forge 2023-03-25 16:19:21 +08:00
shedaniel
521dc1d87d Update to 1.19.4 2023-03-16 18:53:11 +08:00
shedaniel
8c4a74d0f5 Update to 1.19.4-pre3 2023-03-04 03:25:37 +08:00
shedaniel
f0222338f5 Update to Loom 1.1 and Gradle 8 2023-03-04 03:25:36 +08:00
Max
cca739db53 Merge branch '1.19.2' into 1.19.3 2023-02-06 18:02:48 +01:00
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
shedaniel
1c566142fd Support new Forge's BuildContents event, Fix #365 2022-12-11 16:14:14 +08:00
Max
a8683cd979 Fix publishing buildscript tagging Forge as 1.19.2 2022-12-08 21:59:59 +01:00
shedaniel
de600a4145 Update to 1.19.3 2022-12-09 02:05:30 +08:00
shedaniel
d69f264963 Merge remote-tracking branch 'architectury/1.19.2' into 1.19.3 
# Conflicts:
#	fabric/build.gradle
#	fabric/src/main/resources/fabric.mod.json
#	forge/build.gradle
#	gradle.properties
 2022-12-09 01:58:23 +08:00
Max
96f3dc6f9c Buildscript updates, use fabric-api dependency in fmj 2022-12-08 18:10:18 +01:00
shedaniel
e3b4376c5c Merge remote-tracking branch 'architectury/1.19.2' into 1.19.3 2022-11-23 01:51:49 +08: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
96b742bd23 Update to 22w44a 2022-11-09 04:01:55 +08:00
shedaniel
c84ef33756 Merge remote-tracking branch 'architectury/1.19.2' into 1.19.3 
# Conflicts:
#	gradle.properties
 2022-10-23 19:25:07 +08:00
shedaniel
efcbe635b2 Publish Architectury 7 2022-10-23 19:24:52 +08: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
shedaniel
2bc32b35d2 First look of 22w42a while we wait 2022-10-21 00:04:42 +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