Commit Graph

653 Commits

Author SHA1 Message Date
shedaniel
5e4933ea9f Bump version to 12.1
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-05-21 08:58:47 +09:00
Jab125
ba78f466ea Port to 1.20.6 (#494)
* Begin port to 1.20.6

* Port to 1.20.6

* decrease diff

* Fix Creative Tab Ordering

* add test for creative tab ordering

* change up test

* add github actions build for 1.20.6

* fix some outdated things in the github actions

* use the mod bus instead of the neoforge bus when registering menu screens

* update versions in `build.gradle`

* change to 20.6.70-beta

* require 20.6.70

* this doesn't need fabric

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

---------

Signed-off-by: shedaniel <daniel@shedaniel.me>
Co-authored-by: shedaniel <daniel@shedaniel.me>
2024-05-18 21:29:27 +09:00
Jab125
26bf197197 Fix FluidStack.EMPTY always being null (#503) 2024-05-05 13:20:06 +08:00
Jab125
02c89ba625 Fix breakage in NeoForge 20.5.14, fix crash when registering packets on Fabric, fix players getting kicked when a S2C packet is sent to them. (#499)
* Fix #497

* Fix #496

* Fix #498

* Add test for #498

* Update architectury.mixins.json
2024-04-30 00:31:05 +09:00
Jab125
3f0bf226c4 Port to 1.20.5 (#493)
* port to 1.20.5-rc1

* port to 1.20.5

* remove runtime mod menu

* Update build.gradle

* Prepare for publishing

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

* Update shadow plugin to fix building J21 binaries

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

---------

Signed-off-by: shedaniel <daniel@shedaniel.me>
Co-authored-by: shedaniel <daniel@shedaniel.me>
2024-04-24 22:57:28 +09:00
shedaniel
8effe4a56d Port to 1.20.5-pre1
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-04-12 15:51:56 +09:00
shedaniel
b54b89c281 Fix crash on startup
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-04-10 02:51:33 +09:00
shedaniel
0a315a4666 Remove our networking sync code as it is no longer required
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-04-10 02:37:15 +09:00
shedaniel
ff8e05373c Build with Java 21
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-04-09 18:28:30 +09:00
shedaniel
d80b6c2de0 Publish to maven only as beta
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-04-09 18:23:49 +09:00
shedaniel
4e15fa3bbb [ci skip] Port to NeoForge 24w14a
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-04-09 18:16:22 +09:00
shedaniel
d19cb9a8f1 Update to 24w14a
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-04-06 03:09:44 +09:00
shedaniel
d4f399c9e1 Update to 24w12a
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-04-01 20:28:51 +09:00
shedaniel
7684945cc5 Merge remote-tracking branch 'origin/1.20.4' into 1.20.5 2024-04-01 20:05:12 +09:00
Max
327480e549 Merge pull request #483 from desht/desht-forge-fluid-fix
fix: FluidStackImpl#getRawFluidSupplier crashing on forge/neoforge
2024-03-11 12:15:42 +01:00
Des Herriott
3fbee10d1a fix: FluidStackImpl#getRawFluidSupplier crashing on forge/neoforge
Wrap the Holder.Reference returned from Registry#getHolderOrThrow
 inside an actual Supplier
2024-03-11 09:59:49 +00:00
shedaniel
efa34d31ae Reflect changes in FluidStackHooks
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-03-03 20:56:25 +09:00
shedaniel
8d0fdbdbd1 Re-add fluid variants
The implementations in FluidStack regarding components is a stab for what the future api could be, and will definitely change.

Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-03-02 04:14:46 +09:00
shedaniel
7b65d8da73 Update to 24w09a
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-03-01 05:26:50 +09:00
shedaniel
0c3f7c6816 Merge remote-tracking branch 'origin/1.20.2' into 1.20.4
# Conflicts:
#	gradle.properties
2024-02-26 22:16:50 +09:00
shedaniel
81473922e1 Merge remote-tracking branch 'origin/1.20' into 1.20.2
# Conflicts:
#	gradle.properties
2024-02-26 22:13:11 +09:00
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
cd74016d85 Bump version for release
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-02-26 22:10:17 +09:00
shedaniel
a2e5359225 Add client commands
Signed-off-by: shedaniel <daniel@shedaniel.me>
2024-02-26 21:13:36 +09:00
shedaniel
93c804fe07 Merge remote-tracking branch 'origin/1.20.2' into 1.20.4 2024-02-06 18:26:47 +09:00
shedaniel
258f6288b9 Merge remote-tracking branch 'origin/1.20' into 1.20.2
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	fabric/src/main/java/dev/architectury/registry/registries/fabric/RegistrarManagerImpl.java
2024-02-06 18:25:57 +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
907389bd6b Simply NeoForge registrar eventbus 2024-01-09 22:16:28 +09:00
shedaniel
4041bcd4fb Fix missing packet issue on NeoForge 2024-01-09 22:16:26 +09:00
Jab125
760b2a790e Update to NeoForge 20.2.77-beta, Forge 49.0.14 and Fabric Loader & API 0.15.3 & 0.92.0 (#468) 2024-01-07 15:02:00 +09:00
desht
7d771c2814 Build with NeoForge 20.4.46 (20.4.40+ required) (#460) 2023-12-20 18:23:33 +08:00
shedaniel
a69b6b2789 Fix #458 2023-12-09 19:09:06 +08:00
shedaniel
68f3934d57 Remove 1.20.4-Snapshot as a verison 2023-12-09 01:27:18 +08:00
shedaniel
3575429592 Update to 1.20.4 2023-12-09 00:55:47 +08:00
shedaniel
ecdec604e3 Merge remote-tracking branch 'origin/1.20.2' into 1.20.3 2023-12-08 21:09:10 +08:00
shedaniel
f63dc5d0e5 Remove references to ForgeRegistries left 2023-12-08 21:08:34 +08:00
shedaniel
011367bbe1 Fix compile errors 2023-11-21 13:15:43 +08:00
shedaniel
38c3e8e64a Fix #453 2023-11-21 13:13:26 +08:00
shedaniel
af9b6d2901 Update to 1.20.3-pre1 2023-11-21 13:08:20 +08:00
shedaniel
054b13e63e Merge remote-tracking branch 'origin/1.20.2' into 1.20.3
# Conflicts:
#	gradle.properties
#	settings.gradle
2023-11-21 00:20:59 +08:00
shedaniel
9aba3cf1dc Update to 20.2.59-beta & Adapt to Registry Changes 2023-11-20 21:00:36 +08:00
shedaniel
426ca41331 Fix CustomizeGuiOverlayEvent crash 2023-11-19 02:59:27 +08:00
shedaniel
09e04e0cc6 Fix #451 2023-11-19 02:32:00 +08:00
shedaniel
0ff2f7f898 Fix InputEvent.MouseScrollingEvent crash 2023-11-19 00:59:23 +08:00
shedaniel
302dd740c5 Comment out texture stitch event, we will re-evaluate this 2023-11-17 23:12:37 +08:00