Skip to content

Commit

Permalink
Merge from DEV (#60)
Browse files Browse the repository at this point in the history
* ported, fundamentally, but rendering is very broken

* bump malilib, and overlays work again

* bump malilib with loom build 27

* bump to 24w34a --> rendering broke again due to shaders

* fixed shaders

* some strange global stack behavior ...

* cleanup some calls

* text line rendering fixed for scaling

* update yarn & test Iris

* 34w35a (Added a few Debug Renderer's)

* Yarn build 4

* update Configs applu()

* working on some of the debug renderers

* 24w36a yarn build 4

* Update gradle.properties

* 24w36a yarn build 5

* 24w36a yarn build 5

* 24w36a yarn build 6

* 24w36a yarn build 6

* Clamp BottomY for 'Fabulous!' graphics and Spawn Chunk Renderer...

* bump malilib

* Moved Overlay Rendering to "PreWeather" MaLiLib renderPhase.

* WIP 24w37a

* finish 24w37a port

* add worldSeed handling from Servux

* yarn build 4

* Use System.nanoTime() for RenderHandler

* Use System.nanoTime() for RenderHandler

* port to 24w38a ( Broken FAPI )

* Update gradle.properties

* add locked slots rendering and fix IntegratedServer Block entities for inventoryPreview

* prepare for more debug Renderer work

* Oops :)

* malilib bump

* Update gradle.properties

* almost there.

* port to 24w39a

* inventoryPreview/Data Sync seems to function now without needing to store NBT data in the Client World.
(Now need to update the Info Lines to use raw NBT data, if available)

* Info Lines work begin

* NBT-Only Mode works well now for Info Lines.

* Add weather handling from Servux, and "Sheep Color" Info Line.  Should be useful when using Sheep Farms.

* add ID tag to NbtQuery packet replies

* update from yarn & rename Sheep Color to EntityVariant Info Line (Add more later)

* Added various Entity Variants, and fixed 'Servux' Info Line to be more useful.

* fix: MobCapDataHandler.java when in Single Player

* fix: Slime Chunks shouldn't render when there are none to render

* add villagerOfferPriceRange (#56)

* merge "villager price range" PR

* add Horse Fix code from 1.21

* port to 24w40a

* HudMetadata channel bootstrap.

* Yarn build 9

* Some missing items

* fix Recipe Manager Sync, add Player Experience info lines

* fix Recipe Manager Sync, add Player Experience info lines

* fix Furnace XP info line & port to 1.21.2-pre.1

* malilib bump

* malilib bump

* port to pre2, fix some of the debug renderers; and with using a new Servux Protocol

* port to pre2, fix some of the debug renderers; and with using a new Servux Protocol

* port to pre3

* some debug service fixing

* port to rc1, bump gradle to 8.10.2, loom 1.8

* Fix Debug Rendering workflow, and fix Pathfinding, BeeData, and Villager Debug Rendering.

* minor code cleanup

* Port to REL

---------

Co-authored-by: DreamingLri <[email protected]>
  • Loading branch information
sakura-ryoko and DreamingLri authored Oct 23, 2024
1 parent c441af9 commit f2861c6
Showing 1 changed file with 51 additions and 48 deletions.
99 changes: 51 additions & 48 deletions src/main/resources/mixins.minihud.json
Original file line number Diff line number Diff line change
@@ -1,50 +1,53 @@
{
"required": true,
"package": "fi.dy.masa.minihud.mixin",
"compatibilityLevel": "JAVA_17",
"minVersion": "0.8",
"client": [
"IMixinAbstractFurnaceBlockEntity",
"IMixinAbstractHorseEntity",
"IMixinBeaconBlockEntity",
"IMixinBiomeAccess",
"IMixinChunkDeltaUpdateS2CPacket",
"IMixinDataQueryHandler",
"IMixinEntity",
"IMixinEntityNavigation",
"IMixinLeashable",
"IMixinMerchantEntity",
"IMixinPassiveEntity",
"IMixinPiglinEntity",
"IMixinServerWorld",
"IMixinWorld",
"IMixinWorldRenderer",
"IMixinZombieVillagerEntity",
"MixinBeaconBlockEntity",
"MixinBlockOutlineDebugRenderer",
"MixinChatScreen",
"MixinChunkTicketManager",
"MixinClientPlayerInteractionManager",
"MixinClientPlayNetworkHandler",
"MixinConduitBlockEntity",
"MixinDebugInfoSender",
"MixinDebugRenderer",
"MixinHeightmapDebugRenderer",
"MixinItemStack",
"MixinLanguage",
"MixinMinecraftClient",
"MixinMinecraftServer",
"MixinNeighborUpdateDebugRenderer",
"MixinServerEntityManager",
"MixinServerWorld",
"MixinSubtitlesHud"
],
"injectors": {
"defaultRequire": 1
},
"mixins": [
"IMixinMinecraftServer",
"IMixinSkeletonEntity",
"IMixinZombieEntity"
]
"required": true,
"package": "fi.dy.masa.minihud.mixin",
"compatibilityLevel": "JAVA_21",
"minVersion": "0.8",
"client": [
"IMixinAbstractFurnaceBlockEntity",
"IMixinAbstractHorseEntity",
"IMixinBeaconBlockEntity",
"IMixinBiomeAccess",
"IMixinChunkDeltaUpdateS2CPacket",
"IMixinDataQueryHandler",
"IMixinEntity",
"IMixinEntityNavigation",
"IMixinMerchantEntity",
"IMixinMinecraftServer",
"IMixinPassiveEntity",
"IMixinPiglinEntity",
"IMixinServerRecipeManager",
"IMixinServerWorld",
"IMixinSkeletonEntity",
"IMixinWorld",
"IMixinWorldRenderer",
"IMixinZombieEntity",
"IMixinZombieVillagerEntity",
"MixinBeaconBlockEntity",
"MixinChatScreen",
"MixinChunkTicketManager",
"MixinClientCommonNetworkHandler",
"MixinClientPlayerInteractionManager",
"MixinClientPlayNetworkHandler",
"MixinConduitBlockEntity",
"MixinItemStack",
"MixinLanguage",
"MixinMinecraftClient",
"MixinMinecraftServer",
"MixinResourcePackSendS2CPacket",
"MixinServerEntityManager",
"MixinServerWorld",
"MixinSubtitlesHud",
"debug.IMixinDebugRenderer",
"debug.IMixinMobEntity",
"debug.MixinDebugInfoSender",
"debug.MixinDebugRenderer",
"debug.MixinSharedConstants"
],
"injectors": {
"defaultRequire": 1
},
"mixins": [
"debug.MixinPath"
]
}

0 comments on commit f2861c6

Please sign in to comment.