Commit Graph

259 Commits

Author SHA1 Message Date
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
cccbaa2f11 Update FUNDING.yml
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-19 22:48:51 +08:00
Max
fbd72fece9 Update push.yml 2021-05-19 16:39:19 +02:00
Max
9873107634 Update push.yml 2021-05-19 16:36:03 +02:00
shedaniel
bc357eab76 Build on Java 16
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-19 22:34:04 +08:00
Max
4aefdd1000 Remove 1.17 from Java 8 builds 2021-05-19 16:33:26 +02: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
shedaniel
47673c22f2 Merge remote-tracking branch 'architectury/1.16' into 1.16 2021-05-19 22:23:55 +08:00
shedaniel
109c1997cc Update to architectury plugin 3.2
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-19 22:23:48 +08:00
Max
a422420c67 Update pr.yml 2021-05-19 16:23:28 +02:00
Max
728457d416 Remove JDK 11 from build
(Also trying out a new syntax for build versioning that tries to cobble it together from gradle.properties, hopefully it works)
2021-05-19 16:15:17 +02:00
Max
1d1cbff0cd Update pr.yml 2021-05-19 01:53:40 +02:00
Max
648464f00a Update push.yml 2021-05-19 00:54:13 +02:00
Max
8ffbbb6a98 Update pr workflow 2021-05-18 18:07:36 +02:00
Max
43c8bae105 [norelease] Update to archloom 0.7.2 and Gradle 7 2021-05-18 17:49:41 +02:00
Max
0b2c0d8d74 Update push workflow 2021-05-18 17:36:14 +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
Max
bc402d6b5f Update pr.yml 2021-05-14 16:16:53 +02:00
Max
ae3a8a1b1e Update .editorconfig 2021-05-14 16:08:37 +02:00
Max
707408c873 [chore] Update pull request workflow
Does **not** fully solve our issue with snapshot builds just yet, this is just an intermediary solution
2021-05-14 16:06:39 +02:00
Max
6956b95ed9 [chore] Update FUNDING.yml 2021-05-14 14:56:09 +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
shedaniel
c675bf6625 Adds EntityAttributes (#83)
* Adds EntityAttributes

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

* Switch to ConcurrentHashMap

Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-13 13:13:40 +08:00
shedaniel
cfef5f28b7 Allow being more flexible in registering
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-12 15:05:04 +08:00
shedaniel
2eef26f632 Add FuelRegistry (#81)
* Add FuelRegistry

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

* Fix compilation

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

* Remove redundant generic

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

* Change to MinecraftForge.EVENT_BUS

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

* A few docs, and switch to returning 0 for non-fuels

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

* Bump to 1.13
2021-05-12 13:43:03 +08:00
shedaniel
9f07f65196 Remove @NotNull spam
Things should be non null by default, and we mark @Nullable otherwise

Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-11 01:08:08 +08:00
shedaniel
8de2c936b5 Fixes CME with Platform#getMod
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-08 19:21:10 +08:00
shedaniel
4ef8729174 Update to Architectury Plugin 3.1 to support detecting the api FabricLoader
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-03 01:53:45 +08:00
shedaniel
4262a46c61 Fix ExplosionEvent.DETONATE
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-03 01:43:17 +08:00
shedaniel
413f80de6a Update to 20w17a
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-05-03 01:40:32 +08:00
shedaniel
2c21eeeaf7 Merge remote-tracking branch 'architectury/1.16' into 1.17
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	common/src/main/java/me/shedaniel/architectury/event/events/EntityEvent.java
#	common/src/main/java/me/shedaniel/architectury/registry/entity/EntityRenderers.java
#	common/src/main/java/me/shedaniel/architectury/utils/Fraction.java
#	fabric/src/main/java/me/shedaniel/architectury/hooks/fabric/EntityHooksImpl.java
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinCollisionContext.java
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinEntityCollisionContext.java
#	fabric/src/main/java/me/shedaniel/architectury/registry/entity/fabric/EntityRenderersImpl.java
#	fabric/src/main/resources/architectury.mixins.json
#	gradle.properties
2021-05-03 00:58:19 +08:00
shedaniel
5accb65ee8 Add interruptTrue/Default/False as util methods 2021-04-17 22:05:43 +08:00
shedaniel
f06776d884 Bump to 1.11 2021-04-15 23:27:27 +08:00
Max
ca2a528160 Some more (mostly Entity-based) Events (#75)
* Add FarmlandTrample event

* FarmlandTrample debug event

* Add FILL_BUCKET event and testmod

* Add ENTER_CHUNK event and testmod

* Add CHECK_SPAWN on Forge

* CHECK_SPAWN on Fabric part 1 aka: The Concernening

* CHECK_SPAWN on Fabric part 2: I kinda don't hate this as much

* CHECK_SPAWN on Fabric part 3: Patrols

* CHECK_SPAWN on Fabric part 4: catJAM

* CHECK_SPAWN on Fabric part 5: Phantoms

* Fix CHECK_SPAWN for patrols

* Add mod metadata (#73)

* new event system

* Revert patrol spawner behaviour

* Implement CheckSpawn behaviour for spawners and add test (forgot about that)

* Revert "Revert patrol spawner behaviour"

This reverts commit 1da3fb73

* Change MixinPhantomSpawner to SOFT

* Edit forge mods.toml
We support 1.16.2+ on forge

Co-authored-by: shedaniel <daniel@shedaniel.me>
2021-04-15 23:26:48 +08:00
shedaniel
ac94c33e07 Re-license header 2021-04-13 19:40:44 +08:00
shedaniel
6041f836f2 Merge remote-tracking branch 'architectury/feature/armor_tick' into 1.16 2021-04-13 19:39:56 +08:00
shedaniel
ec06bd3b96 Add docs 2021-04-10 21:28:48 +08:00
shedaniel
35145b9acb Add getCustomEquipmentSlot 2021-04-10 20:33:26 +08:00
shedaniel
27addc91d9 Close #39 2021-04-10 20:13:19 +08:00
shedaniel
0cbd75663d Remove @ScheduledForRemoval 2021-04-09 22:47:52 +08:00
shedaniel
c2cb308655 Update to 21w14a, remove typetools, remove fractions in favor of 81000 2021-04-09 22:45:04 +08:00
shedaniel
c56ca3cc6a Merge remote-tracking branch 'architectury/1.16' into 1.17
# Conflicts:
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinBlockEntityExtension.java
#	fabric/src/main/resources/architectury.mixins.json
#	gradle.properties
2021-04-09 21:54:50 +08:00
shedaniel
2af34feb2a Fix invalid events 2021-03-30 01:19:43 +08:00
Max
2846a9616a Merge remote-tracking branch 'architectury/1.16' into 1.16 2021-03-22 22:28:59 +01:00
Max
9fb19f9605 Bump forge event priority to HIGH
My reasoning for this lies in the quirk that Forge by default cancels all following event listeners when one of them fails with an Exception. Because we are an API that mods need to be able to rely on, and this may cause cascading issues with mods that depend on us down the line (see https://github.com/KubeJS-Mods/KubeJS/issues/101), I think we should act on HIGH priority by default to reduce the risk of this happening
2021-03-22 22:28:37 +01:00