Commit Graph

166 Commits

Author SHA1 Message Date
Max
fc31afa2b8 Add docs and util methods from #104 on top of previous PR
(I **completely** forgot I already implemented this for 1.16...)

Signed-off-by: Max <maxh2709@gmail.com>
2022-01-31 19:02:07 +01:00
Max
38a2e56461 BiomeModifications on Forge now uses Forge's builtin priority system (#188)
* BiomeModifications on Forge now uses Forge's builtin priority system

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

* Bump minor version

Signed-off-by: Max <maxh2709@gmail.com>
2022-01-31 16:20:50 +01:00
Max
5a6f4b1176 Implement ClientLifecycleEvent on Forge (+ testmod)
Signed-off-by: Max <maxh2709@gmail.com>
2022-01-30 03:23:02 +01:00
Max
8b282f5c5a 3.4 : License and workflow updates, deprecate NbtType, merge #159 and #160
Signed-off-by: Max <maxh2709@gmail.com>
2021-12-31 23:06:44 +01:00
shedaniel
39e216bbed [ci skip] Entity Model Layer Reg, and move to new package (#159) 2021-12-31 22:36:08 +01:00
shedaniel
6a6cad7025 [ci skip] Introduce EntitySpawnExtension (#160)
* Introduce EntitySpawnExtension

* Add to mixins

* Update common/src/main/java/dev/architectury/extensions/network/EntitySpawnExtension.java

* Update common/src/main/java/dev/architectury/networking/NetworkManager.java

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2021-12-31 22:35:40 +01:00
Max
2aa674616b Loosen version constraints to accept any 1.18 version
(You should still be using 1.18.1, though, as it is the only version supported by Mojang / Forge, and we may be switching to it permanently at a later date)

Signed-off-by: Max <maxh2709@gmail.com>
2021-12-27 17:43:48 +01:00
Max
a5d32c3f9a Update to 1.18.1, Forge 39, and add Loader and FAPI to fmj depends (#151)
Signed-off-by: Max <maxh2709@gmail.com>
2021-12-26 23:18:23 +01:00
shedaniel
eea1b5182c Add LifecycleEvent.SETUP for manipulating things after normal init (#148)
* Add LifecycleEvent.SETUP for manipulating things after normal initialization

* Improve javadocs

* Fix broken english

* Update common/src/main/java/dev/architectury/event/events/common/LifecycleEvent.java

Co-authored-by: BasiqueEvangelist <basiqueevangelist@yandex.ru>
Signed-off-by: Max <maxh2709@gmail.com>
2021-12-26 20:20:00 +01:00
Juuxel
90d4a59986 Add 1.18.1 to MC versions on CF (#156) 2021-12-22 14:39:03 +08:00
shedaniel
3083c82843 Add ClientReloadShadersEvent (#149)
Signed-off-by: Max <maxh2709@gmail.com>
2021-12-20 03:49:44 +01:00
shedaniel
11ef83f9de Fix #150 2021-12-12 22:01:28 +08:00
shedaniel
ebbc2a6490 Remove hacks around RegistryEntry (#144) 2021-12-11 19:05:36 +08:00
shedaniel
7857615bfc Migrate to transitive access wideners (#146)
* Migrate to transitive access wideners

* Fix invalid AW

* Bump minor version, changes to gradle buildscript

Co-authored-by: Max <maxh2709@gmail.com>
2021-12-08 22:17:44 +08:00
shedaniel
7d745d612c Re-use RenderTooltipEvent#getPoseStack on forge 2021-12-02 17:25:40 +08:00
shedaniel
582e0a001c Update Forge to enable Mixins 2021-12-02 17:25:23 +08:00
shedaniel
eeaaf273c6 Forge 1.18 Support 2021-12-02 01:11:27 +08:00
shedaniel
d49d13b19f Merge remote-tracking branch 'architectury/1.17' into 1.18
# Conflicts:
#	gradle.properties
2021-11-27 00:19:12 +08:00
shedaniel
7d721c8521 Add Registries#forRegistry and delay getting forge mod event bus (#82) 2021-11-27 00:18:55 +08:00
shedaniel
a7ecdcf578 Removed Deprecated API 2021-11-14 02:32:49 +08:00
shedaniel
a6a361e5e1 Add support for PacketTransformer and a SplitPacketTransformer (#142)
* Add support for PacketTransformer and a SplitPacketTransformer

* Add testmod and make it work

* Add experimental, Remove generics, they are pointless
2021-10-23 18:27:28 +08:00
shedaniel
f636b1ad96 Switch to gradle components 2021-10-13 22:08:53 +08:00
shedaniel
c3ffa8d976 Update to Loom 0.10.0 and add Mixins 2021-09-22 23:03:07 +08:00
shedaniel
88dbf04c9b Implement item properties (#132) 2021-08-30 02:56:33 +08:00
Leo40Git
32a44239ea Add tool interaction recipe hooks 2021-08-11 12:14:26 +03:00
shedaniel
790edf8264 Fix ChunkDataEvent.Load 2021-08-02 19:25:42 +08:00
shedaniel
74069d1bb0 Should be fine now, right? 2021-08-02 03:05:41 +08:00
shedaniel
bf34031711 WIP Forge port 2021-07-29 23:03:06 +08:00
shedaniel
e45dc97e92 Allow adding supplied effects to FoodProperties (#119)
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-04 18:40:27 +08:00
shedaniel
734a310c98 Make ColorHandlers wildcard, fix #114
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-07-01 19:23:39 +02:00
Leo40Git
f6649ae398 Particle Provider API (#110)
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-27 14:08:54 +08:00
lazynessmind
125494399d Entity Event: Animal Tame (#109) 2021-06-24 00:46:14 +08:00
Max
c12524b7aa [norelease] Switch to loom 0.9, crane and quiltflower
(I can't believe that ALL of these work out of the box)
2021-06-22 12:30:45 +02:00
shedaniel
d1e8d82ddb Publish the sources properly
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-20 20:35:42 +08:00
Max
cccdb141f2 Bump Mixin Java Level 2021-06-10 13:30:20 +00:00
shedaniel
56ebb43da4 1.17
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-09 00:49:14 +08:00
shedaniel
ac3bb7ccc0 Fix #98
Please merge when CF is back

Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-31 19:51:04 +08:00
shedaniel
8b262d07c0 Refactor and 1.17-pre1 (#96)
* Fix #94

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

* Add Chunk data save and load events, closes #89 (#92)

* Created Chunk save and load event. Closes #89

* Fixed missing licence

* Update common/src/main/java/me/shedaniel/architectury/event/events/ChunkEvent.java

* Update common/src/main/java/me/shedaniel/architectury/event/events/ChunkEvent.java

* Update common/src/main/java/me/shedaniel/architectury/event/events/ChunkEvent.java

* Supply ServerLevel in ChunkEvent.LOAD, style cleanup

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

* Add "Data" suffix to Chunk IO Events and mark level as nullable for load

* Update common/src/main/java/me/shedaniel/architectury/event/events/ChunkEvent.java

* Bump to 1.16

Co-authored-by: shedaniel <daniel@shedaniel.me>
Co-authored-by: Max <maxh2709@gmail.com>

* Update pr.yml

* Add NetworkManager hook for Entity spawn packets (#88)

* New utility hook for creating a entity spawn packet. before every mod had to implement this in itself.

* Apply suggestions from code review

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

* Update common/src/main/java/me/shedaniel/architectury/networking/NetworkManager.java

* Update common/src/main/java/me/shedaniel/architectury/networking/NetworkManager.java

* Properly implement SpawnEntityPacket & Format style

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

* Format

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

* createEntitySpawnPacket -> createAddEntityPacket for mojmap consistency

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

* Bump version to 1.17

Co-authored-by: Max <maxh2709@gmail.com>
Co-authored-by: shedaniel <daniel@shedaniel.me>

* Add Javadocs for all events (#91)

* javadoc for ClientChatEvent

* javadoc for ClientPlayerEvent

* javadoc for ClientRawInputEvent

* Added javadoc for ClientScreenInputEvent

* Bit refactoring and removed javadoc @see to the caller methods

* Add javadoc for BlockEvent

* Add javadoc for ChatEvent

* Add javadoc for CommandPerformEvent and CommandRegistrationEvent

* Add javadoc for EntityEvent

* Add javadoc for ExplosionEvent

* Add javadoc for GuiEvent

* Add javadoc for InteractionEvent

* Add javadoc for LightningEvent, RecipeUpdateEvent & TextureStitchEvent

* Add javadoc for LifecycleEvent & ClientLifecycleEvent

* Add javadoc for TooltipEvent

* Add javadoc for TickEvent and partly PlayerEvent

* More javadoc for PlayerEvent

* Finally all event have javadoc

* Update common/src/main/java/me/shedaniel/architectury/event/events/CommandPerformEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/CommandPerformEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/CommandPerformEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/ChatEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/CommandRegistrationEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/EntityEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/EntityEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/EntityEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/EntityEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/client/ClientScreenInputEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/client/ClientScreenInputEvent.java

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

* Update common/src/main/java/me/shedaniel/architectury/event/events/BlockEvent.java

Co-authored-by: Max <maxh2709@gmail.com>

* Update common/src/main/java/me/shedaniel/architectury/event/events/BlockEvent.java

Co-authored-by: Max <maxh2709@gmail.com>

* Update common/src/main/java/me/shedaniel/architectury/event/events/BlockEvent.java

Co-authored-by: Max <maxh2709@gmail.com>

* Update common/src/main/java/me/shedaniel/architectury/event/events/BlockEvent.java

Co-authored-by: Max <maxh2709@gmail.com>

* Update common/src/main/java/me/shedaniel/architectury/event/events/LifecycleEvent.java

Co-authored-by: Max <maxh2709@gmail.com>

* Update common/src/main/java/me/shedaniel/architectury/event/events/LifecycleEvent.java

Co-authored-by: Max <maxh2709@gmail.com>

* Update common/src/main/java/me/shedaniel/architectury/event/events/LifecycleEvent.java

Co-authored-by: Max <maxh2709@gmail.com>

* Update common/src/main/java/me/shedaniel/architectury/event/events/PlayerEvent.java

Co-authored-by: Max <maxh2709@gmail.com>

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

* Apply suggestions from code review

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

* Applied some more reviews

* Applied some more reviews

* Applied suggestions

* Reformat and apply some minor suggestions

* Apply suggestions from review (first batch)

* Remove double return javadoc

* Apply suggestions from code review

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

* Add "scaled" to mouse coordinates

* Final touches

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

* Remove invalid tips

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

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

* Refactor

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

* Update common/src/main/java/dev/architectury/event/events/common/InteractionEvent.java

Co-authored-by: Max <maxh2709@gmail.com>

* Apply suggestions from code review

Co-authored-by: Max <maxh2709@gmail.com>

* attack -> hurt

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

* Update @param for InteractionEvent#FARMLAND_TRAMPLE

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

* world -> level

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

* Relocate hooks

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

* Organize imports

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

* Registry -> Registrar Please voice out your opinion!!

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

* Some more renames
itemOptional -> optionalItem
RegistryBuilder -> RegistrarBuilder
RegistryOption -> RegistrarOption
Not forcing RegistryEntry on new registries, vanilla types don't have them

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

* Java 16-ification

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

* Optimise imports after the var change

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

* Un-minimize architectury-common.mixins.json

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

Co-authored-by: canitzp <12819060+canitzp@users.noreply.github.com>
Co-authored-by: Max <maxh2709@gmail.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
2021-05-30 19:08:11 +08:00
shedaniel
53cc9133e4 Merge remote-tracking branch 'architectury/1.16' into 1.17 2021-05-20 23:14:47 +08:00
shedaniel
d0972fbe57 Fix CF Publish
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-20 23:14:37 +08:00
shedaniel
1404a33f40 Update to 21w20a
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-20 23:00:12 +08:00
shedaniel
5e75d5e278 Merge remote-tracking branch 'architectury/1.16' into 1.17
# Conflicts:
#	.github/workflows/push.yml
2021-05-20 22:25:25 +08:00
shedaniel
3926bf2a91 Fix Collections$UnmodifiableRandomAccessList
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-20 22:04:01 +08:00
shedaniel
40bcee6a45 Merge remote-tracking branch 'architectury/1.16' into 1.17
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	.github/workflows/publish.yml
#	.github/workflows/snapshot.yml
#	build.gradle
#	common/src/main/resources/architectury-common.mixins.json
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinLevelChunk.java
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinServerLevel.java
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/client/MixinMouseHandler.java
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/client/MixinScreen.java
#	forge/gradle.properties
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	testmod-fabric/build.gradle
#	testmod-forge/gradle.properties
2021-05-19 22:28:49 +08:00
Max
43c8bae105 [norelease] Update to archloom 0.7.2 and Gradle 7 2021-05-18 17:49:41 +02:00
canitzp
98e06736ee Fix TradeRegistryImpl throwing an AssertionError at runtime (#87) 2021-05-17 22:16:00 +02:00
Max
428f98be44 Reformat and bump version 2021-05-15 00:13:39 +02:00
canitzp
2ff5dd500d Add an easy way to register Villager and Wandering Trader trades (#84)
* Add TradeRegistry to add Trades a bit more easily. Uses the VillagerTradesEvent on forge

* Added TradeRegistry#registerTradeForWanderer which uses the WandererTraderEvent on forge

* Added javadoc

* Use Fabric own Trade implementation and fixed Test Mod

* Update common/src/main/java/me/shedaniel/architectury/registry/TradeRegistry.java

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

* Update common/src/main/java/me/shedaniel/architectury/registry/TradeRegistry.java

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

* Update common/src/main/java/me/shedaniel/architectury/registry/TradeRegistry.java

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

* Update common/src/main/java/me/shedaniel/architectury/registry/TradeRegistry.java

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

* Added javadoc for SimpleTrade

* Use two lists instead of Int2ObjectMap

* Use "registerTradeForWanderingTrader" instead of "registerTradeForWanderer" for better clarification

* Use IllegalArgumentException instead of RuntimeException

* Remove level limit (Mods may be able to remove this restriction in VillagerData#canLevelUp), Clean up forge's implementation

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

* Clean up TestTrades and add licenses

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

* [ciskip] Reintroduce lower bound validation for level

Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: shedaniel <daniel@shedaniel.me>
Co-authored-by: Max <maxh2709@gmail.com>
2021-05-14 23:59:58 +02:00
shedaniel
2956355ce7 Update to 21w19a and require java 16 for compilation
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-14 19:45:58 +08:00
shedaniel
d2952b0462 Merge remote-tracking branch 'architectury/1.16' into 1.17
# Conflicts:
#	common/src/main/java/me/shedaniel/architectury/event/events/ChatEvent.java
#	common/src/main/java/me/shedaniel/architectury/registry/BlockEntityRenderers.java
#	common/src/main/java/me/shedaniel/architectury/utils/Fraction.java
#	fabric/src/main/java/me/shedaniel/architectury/registry/fabric/BlockEntityRenderersImpl.java
#	gradle.properties
2021-05-14 19:22:33 +08:00