Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 1bec8b5
Author: Sakura Ryoko <[email protected]>
Date:   Tue Oct 22 20:28:59 2024 -0400

    Port to REL

commit 434de69
Author: Sakura Ryoko <[email protected]>
Date:   Mon Oct 21 21:36:54 2024 -0400

    minor code cleanup

commit 8343ea1
Author: Sakura Ryoko <[email protected]>
Date:   Mon Oct 21 20:43:38 2024 -0400

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

commit 425185c
Author: Sakura Ryoko <[email protected]>
Date:   Sun Oct 20 19:49:38 2024 -0400

    port to rc1, bump gradle to 8.10.2, loom 1.8

commit 0181a7c
Author: Sakura Ryoko <[email protected]>
Date:   Fri Oct 11 19:30:29 2024 -0400

    some debug service fixing

commit dfe4f7a
Author: Sakura Ryoko <[email protected]>
Date:   Fri Oct 11 10:40:28 2024 -0400

    port to pre3

commit ad9442c
Author: Sakura Ryoko <[email protected]>
Date:   Thu Oct 10 20:51:19 2024 -0400

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

commit ad42ebc
Author: Sakura Ryoko <[email protected]>
Date:   Thu Oct 10 20:35:10 2024 -0400

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

commit a563294
Author: Sakura Ryoko <[email protected]>
Date:   Wed Oct 9 19:43:48 2024 -0400

    malilib bump

commit bd37cd8
Author: Sakura Ryoko <[email protected]>
Date:   Tue Oct 8 23:51:33 2024 -0400

    malilib bump

commit 2d44eb9
Author: Sakura Ryoko <[email protected]>
Date:   Tue Oct 8 21:16:56 2024 -0400

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

commit 9d1c088
Author: Sakura Ryoko <[email protected]>
Date:   Sat Oct 5 00:02:00 2024 -0400

    fix Recipe Manager Sync, add Player Experience info lines

commit 6edafbc
Author: Sakura Ryoko <[email protected]>
Date:   Fri Oct 4 23:47:20 2024 -0400

    fix Recipe Manager Sync, add Player Experience info lines

commit cf941f6
Author: Sakura Ryoko <[email protected]>
Date:   Fri Oct 4 15:10:41 2024 -0400

    Some missing items

commit 6b3c348
Author: Sakura Ryoko <[email protected]>
Date:   Fri Oct 4 14:05:04 2024 -0400

    Yarn build 9

commit 253a7c2
Author: Sakura Ryoko <[email protected]>
Date:   Thu Oct 3 00:16:10 2024 -0400

    HudMetadata channel bootstrap.

commit 9e519c1
Author: Sakura Ryoko <[email protected]>
Date:   Wed Oct 2 15:42:02 2024 -0400

    port to 24w40a

commit 8c4d43a
Author: Sakura Ryoko <[email protected]>
Date:   Tue Oct 1 19:36:24 2024 -0400

    add Horse Fix code from 1.21

commit decba79
Author: Sakura Ryoko <[email protected]>
Date:   Mon Sep 30 20:29:23 2024 -0400

    merge "villager price range" PR

commit 5bc42de
Author: DreamingLri <[email protected]>
Date:   Tue Oct 1 08:20:46 2024 +0800

    add villagerOfferPriceRange (#56)

commit c707cf9
Author: Sakura Ryoko <[email protected]>
Date:   Mon Sep 30 20:12:02 2024 -0400

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

commit 631d433
Author: Sakura Ryoko <[email protected]>
Date:   Mon Sep 30 18:33:41 2024 -0400

    fix: MobCapDataHandler.java when in Single Player

commit ae75aeb
Author: Sakura Ryoko <[email protected]>
Date:   Mon Sep 30 01:00:07 2024 -0400

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

commit ac7057c
Author: Sakura Ryoko <[email protected]>
Date:   Sun Sep 29 14:01:37 2024 -0400

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

commit 517276d
Author: Sakura Ryoko <[email protected]>
Date:   Sat Sep 28 10:25:55 2024 -0400

    add ID tag to NbtQuery packet replies

commit 69e02ff
Author: Sakura Ryoko <[email protected]>
Date:   Sat Sep 28 00:37:40 2024 -0400

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

commit acf2672
Author: Sakura Ryoko <[email protected]>
Date:   Thu Sep 26 23:45:36 2024 -0400

    NBT-Only Mode works well now for Info Lines.

commit 49841df
Author: Sakura Ryoko <[email protected]>
Date:   Wed Sep 25 22:28:01 2024 -0400

    Info Lines work begin

commit 82a44ce
Author: Sakura Ryoko <[email protected]>
Date:   Wed Sep 25 21:29:28 2024 -0400

    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)

commit 7767af5
Author: Sakura Ryoko <[email protected]>
Date:   Wed Sep 25 14:21:54 2024 -0400

    port to 24w39a

commit 558e537
Author: Sakura Ryoko <[email protected]>
Date:   Tue Sep 24 23:23:26 2024 -0400

    almost there.

commit a977bd2
Author: Sakura Ryoko <[email protected]>
Date:   Tue Sep 24 00:42:46 2024 -0400

    Update gradle.properties

commit 23208d7
Author: Sakura Ryoko <[email protected]>
Date:   Mon Sep 23 17:11:45 2024 -0400

    malilib bump

commit 6e6d5eb
Author: Sakura Ryoko <[email protected]>
Date:   Mon Sep 23 00:16:02 2024 -0400

    Oops :)

commit fb41aa9
Author: Sakura Ryoko <[email protected]>
Date:   Mon Sep 23 00:15:24 2024 -0400

    prepare for more debug Renderer work

commit 0a56297
Author: Sakura Ryoko <[email protected]>
Date:   Sun Sep 22 22:23:11 2024 -0400

    add locked slots rendering and fix IntegratedServer Block entities for inventoryPreview

commit a590682
Author: Sakura Ryoko <[email protected]>
Date:   Wed Sep 18 15:03:04 2024 -0400

    Update gradle.properties

commit 0fb0271
Author: Sakura Ryoko <[email protected]>
Date:   Wed Sep 18 13:36:00 2024 -0400

    port to 24w38a ( Broken FAPI )

commit 5334dc8
Author: Sakura Ryoko <[email protected]>
Date:   Fri Sep 13 16:03:05 2024 -0400

    Use System.nanoTime() for RenderHandler

commit b702ea2
Author: Sakura Ryoko <[email protected]>
Date:   Fri Sep 13 15:58:30 2024 -0400

    Use System.nanoTime() for RenderHandler

commit 50212ba
Author: Sakura Ryoko <[email protected]>
Date:   Fri Sep 13 00:25:27 2024 -0400

    yarn build 4

commit e0c1ddb
Author: Sakura Ryoko <[email protected]>
Date:   Wed Sep 11 22:32:30 2024 -0400

    add worldSeed handling from Servux

commit 6ef922b
Author: Sakura Ryoko <[email protected]>
Date:   Wed Sep 11 19:21:33 2024 -0400

    finish 24w37a port

commit aaf2e87
Author: Sakura Ryoko <[email protected]>
Date:   Wed Sep 11 15:24:11 2024 -0400

    WIP 24w37a

commit 0bcf023
Author: Sakura Ryoko <[email protected]>
Date:   Tue Sep 10 01:47:31 2024 -0400

    Moved Overlay Rendering to "PreWeather" MaLiLib renderPhase.

commit 7040329
Author: Sakura Ryoko <[email protected]>
Date:   Tue Sep 10 01:33:25 2024 -0400

    bump malilib

commit 06017b9
Author: Sakura Ryoko <[email protected]>
Date:   Sat Sep 7 16:19:46 2024 -0400

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

commit 9dafa47
Author: Sakura Ryoko <[email protected]>
Date:   Sat Sep 7 13:30:28 2024 -0400

    24w36a yarn build 6

commit 391bc30
Author: Sakura Ryoko <[email protected]>
Date:   Fri Sep 6 17:43:29 2024 -0400

    24w36a yarn build 6

commit a4155aa
Author: Sakura Ryoko <[email protected]>
Date:   Thu Sep 5 23:30:51 2024 -0400

    24w36a yarn build 5

commit b19e82f
Author: Sakura Ryoko <[email protected]>
Date:   Thu Sep 5 23:30:22 2024 -0400

    24w36a yarn build 5

commit dd5a8ae
Author: Sakura Ryoko <[email protected]>
Date:   Thu Sep 5 08:29:44 2024 -0400

    Update gradle.properties

commit 823da5b
Author: Sakura Ryoko <[email protected]>
Date:   Wed Sep 4 23:29:39 2024 -0400

    24w36a yarn build 4

commit 5fd13a2
Author: Sakura Ryoko <[email protected]>
Date:   Mon Sep 2 19:17:44 2024 -0400

    working on some of the debug renderers

commit 463e047
Author: Sakura Ryoko <[email protected]>
Date:   Mon Sep 2 13:36:48 2024 -0400

    update Configs applu()

commit 53a6d7b
Author: Sakura Ryoko <[email protected]>
Date:   Fri Aug 30 01:33:58 2024 -0400

    Yarn build 4

commit 3a77376
Author: Sakura Ryoko <[email protected]>
Date:   Thu Aug 29 00:00:24 2024 -0400

    34w35a (Added a few Debug Renderer's)

commit fe7d34f
Author: Sakura Ryoko <[email protected]>
Date:   Tue Aug 27 22:24:32 2024 -0400

    update yarn & test Iris

commit dd783a6
Author: Sakura Ryoko <[email protected]>
Date:   Sun Aug 25 12:02:52 2024 -0400

    text line rendering fixed for scaling

commit 552be5d
Author: Sakura Ryoko <[email protected]>
Date:   Fri Aug 23 20:59:27 2024 -0400

    cleanup some calls

commit 200deed
Author: Sakura Ryoko <[email protected]>
Date:   Fri Aug 23 00:55:12 2024 -0400

    some strange global stack behavior ...

commit c48ca2c
Author: Sakura Ryoko <[email protected]>
Date:   Thu Aug 22 01:27:07 2024 -0400

    fixed shaders

commit 8e90c36
Author: Sakura Ryoko <[email protected]>
Date:   Wed Aug 21 22:41:24 2024 -0400

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

commit 37d9fde
Author: Sakura Ryoko <[email protected]>
Date:   Wed Aug 21 02:15:48 2024 -0400

    bump malilib with loom build 27

commit 9fd9667
Author: Sakura Ryoko <[email protected]>
Date:   Mon Aug 19 23:23:31 2024 -0400

    bump malilib, and overlays work again

commit 53ac6b5
Author: Sakura Ryoko <[email protected]>
Date:   Sun Aug 18 16:37:31 2024 -0400

    ported, fundamentally, but rendering is very broken
  • Loading branch information
sakura-ryoko committed Oct 23, 2024
1 parent cc2508e commit c441af9
Show file tree
Hide file tree
Showing 80 changed files with 5,567 additions and 2,626 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.7-SNAPSHOT'
id 'fabric-loom' version '1.8-SNAPSHOT'
}

sourceCompatibility = JavaVersion.VERSION_21
Expand All @@ -8,7 +8,7 @@ targetCompatibility = JavaVersion.VERSION_21
repositories {
maven { url 'https://masa.dy.fi/maven' }
maven { url 'https://maven.terraformersmc.com/releases/' }
maven { url 'https://jitpack.io' }
maven { url 'https://jitpack.io' }
}

dependencies {
Expand All @@ -21,7 +21,7 @@ dependencies {
modImplementation "com.github.sakura-ryoko:malilib:${project.malilib_id}"

// Fabric API. This is technically optional, but you probably want it anyway.
//modCompile "net.fabricmc.fabric-api:fabric-api:" + project.fabric_version
//modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"

modCompileOnly "com.terraformersmc:modmenu:${project.mod_menu_version}"
}
Expand Down
18 changes: 9 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ author = masa
mod_file_name = minihud-fabric

# Current mod version
mod_version = 0.32.50-sakura.1
mod_version = 0.33.0-sakura.1

# Required malilib version
malilib_version = 0.21.1-sakura.1
malilib_id = fda2a23dfc
malilib_version = 0.22.0-sakura.1
malilib_id = cedafa9370

# Minecraft, Fabric Loader and API and mappings versions
minecraft_version_out = 1.21
minecraft_version = 1.21
mappings_version = 1.21+build.9
minecraft_version_out = 1.21.2
minecraft_version = 1.21.2
mappings_version = 1.21.2+build.1

fabric_loader_version = 0.15.11
mod_menu_version = 11.0.1
# fabric_api_version = 0.100.7+1.21
fabric_loader_version = 0.16.7
mod_menu_version = 12.0.0-beta.1
# fabric_api_version = 0.106.1+1.21.2
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/fi/dy/masa/minihud/InitHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import fi.dy.masa.malilib.event.*;
import fi.dy.masa.malilib.interfaces.IInitializationHandler;
import fi.dy.masa.minihud.config.Configs;
import fi.dy.masa.minihud.data.EntitiesDataStorage;
import fi.dy.masa.minihud.data.DebugDataManager;
import fi.dy.masa.minihud.data.EntitiesDataManager;
import fi.dy.masa.minihud.data.HudDataManager;
import fi.dy.masa.minihud.event.*;
import fi.dy.masa.minihud.hotkeys.KeyCallbacks;
import fi.dy.masa.minihud.util.DataStorage;
Expand All @@ -16,15 +18,17 @@ public void registerModHandlers()
{
ConfigManager.getInstance().registerConfigHandler(Reference.MOD_ID, new Configs());
DataStorage.getInstance().onGameInit();
EntitiesDataStorage.getInstance().onGameInit();
HudDataManager.getInstance().onGameInit();
EntitiesDataManager.getInstance().onGameInit();
DebugDataManager.getInstance().onGameInit();

InputEventHandler.getKeybindManager().registerKeybindProvider(InputHandler.getInstance());
InputEventHandler.getInputManager().registerMouseInputHandler(InputHandler.getInstance());

RenderHandler renderer = RenderHandler.getInstance();
RenderEventHandler.getInstance().registerGameOverlayRenderer(renderer);
RenderEventHandler.getInstance().registerTooltipLastRenderer(renderer);
RenderEventHandler.getInstance().registerWorldLastRenderer(renderer);
RenderEventHandler.getInstance().registerWorldPreWeatherRenderer(renderer);

WorldLoadListener listener = new WorldLoadListener();
WorldLoadHandler.getInstance().registerWorldLoadPreHandler(listener);
Expand All @@ -34,7 +38,7 @@ public void registerModHandlers()
ServerHandler.getInstance().registerServerHandler(serverListener);

TickHandler.getInstance().registerClientTickHandler(new ClientTickHandler());
TickHandler.getInstance().registerClientTickHandler(EntitiesDataStorage.getInstance());
TickHandler.getInstance().registerClientTickHandler(EntitiesDataManager.getInstance());

KeyCallbacks.init();
}
Expand Down
Loading

0 comments on commit c441af9

Please sign in to comment.