Added Favorite Abiphone Contacts and Power stones keybinds. First Version of the mod! 0.0.1

Author: Frostzie

gradle/libs.versions.toml

@@ -4,9 +4,9 @@ yarn_mappings = "1.21.4+build.8"
 loader_version = "0.16.10"
 fabric_version = "0.119.2+1.21.4"
 kotlin = "2.1.0"
-fabric_kotlin = "1.13.2+kotlin.2.1.20"
+fabric_kotlin = "1.13.3+kotlin.2.1.21"
 modmenu = "13.0.3"
-moulconfig = "3.7.0"
+moulconfig = "3.8.0"
 gson = "2.11.0"
 devauth = "1.2.1"
 #TODO: Add Jarvis support https://github.com/nea89o/jarvis

src/main/java/io/github/frostzie/skyfall/ConfigAccessors.kt

@@ -0,0 +1,15 @@
+package io.github.frostzie.skyfall
+
+class ConfigAccessors {
+    companion object {
+        @JvmStatic
+        fun hideBlockBreakingParticles(): Boolean {
+            return SkyFall.Companion.feature.miscFeatures.blockBreakingParticles
+        }
+
+        @JvmStatic
+        fun hidePotionEffectsHud(): Boolean {
+            return SkyFall.Companion.feature.miscFeatures.hidePotionHud
+        }
+    }
+}

src/main/java/io/github/frostzie/skyfall/mixin/MixinBlockParticles.java

@@ -1,6 +1,6 @@
 package io.github.frostzie.skyfall.mixin;
 
-import io.github.frostzie.skyfall.utils.ConfigAccessors;
+import io.github.frostzie.skyfall.ConfigAccessors;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.particle.ParticleManager;
 import net.minecraft.util.math.BlockPos;
@@ -14,7 +14,7 @@
 public abstract class MixinBlockParticles {
     @Inject(method = "addBlockBreakParticles", at = @At("HEAD"), cancellable = true)
     private void onAddBlockDestroyEffects(BlockPos pos, BlockState state, CallbackInfo ci) {
-        if (ConfigAccessors.hideBlockBreakingParticles()) { // Use class name
+        if (ConfigAccessors.hideBlockBreakingParticles()) {
             ci.cancel();
         }
     }

src/main/java/io/github/frostzie/skyfall/mixin/MixinHandledScreen.java

@@ -0,0 +1,22 @@
+package io.github.frostzie.skyfall.mixin;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import io.github.frostzie.skyfall.utils.events.SlotRenderEvents;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.screen.ScreenHandler;
+import net.minecraft.screen.slot.Slot;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(HandledScreen.class)
+public class MixinHandledScreen<T extends ScreenHandler> {
+
+    @WrapOperation(method = "drawSlots", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawSlot(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/screen/slot/Slot;)V"))
+    public void onDrawSlots(HandledScreen<T> instance, DrawContext context, Slot slot, Operation<Void> original) {
+        var before = new SlotRenderEvents.Before(context, slot);
+        SlotRenderEvents.INSTANCE.publish(before);
+        original.call(instance, context, slot);
+    }
+}

src/main/java/io/github/frostzie/skyfall/mixin/MixinHidePotionHud.java

@@ -1,6 +1,6 @@
 package io.github.frostzie.skyfall.mixin;
 
-import io.github.frostzie.skyfall.utils.ConfigAccessors;
+import io.github.frostzie.skyfall.ConfigAccessors;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.StatusEffectsDisplay;
 import org.spongepowered.asm.mixin.Mixin;
@@ -17,8 +17,7 @@ private MixinHidePotionHud()
     }
 
     @Inject(method = "drawStatusEffects(Lnet/minecraft/client/gui/DrawContext;II)V", at = @At("HEAD"), cancellable = true)
-    private void disableStatusEffectRendering(DrawContext context, int mouseX, int mouseY, CallbackInfo ci)
-    {
+    private void disableStatusEffectRendering(DrawContext context, int mouseX, int mouseY, CallbackInfo ci) {
         if (ConfigAccessors.hidePotionEffectsHud()) {
             ci.cancel();
         }

src/main/java/io/github/frostzie/skyfall/mixin/accessor/MouseAccessor.java

@@ -14,6 +14,7 @@ public interface MouseAccessor {
     @Mutable
     @Accessor("y")
     void skyfall_setMouseY(double yPos);
+
     @Mutable
     @Accessor("cursorDeltaX")
     void skyfall_setCursorDeltaX(double deltaX);

src/main/kotlin/io/github/frostzie/skyfall/commands/AlwaysOnCommands.kt

@@ -1,6 +1,6 @@
 package io.github.frostzie.skyfall.commands
 
-import io.github.frostzie.skyfall.config.gui.ConfigGuiManager
+import io.github.frostzie.skyfall.config.ConfigGuiManager
 import io.github.frostzie.skyfall.utils.ChatUtils
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback
@@ -37,55 +37,7 @@ object AlwaysOnCommands {
                             "§f&o = §oItalic            §f&n = §nUnderline\n" +
                             "§f&r = Reset\n" +
                     "§c==================================================="
-                ).send()
-                1
-            })
-        }
-    }
-
-    fun sfHelp() {          //TODO: Later on improve the look of this and add all the other cmds that come along
-        Command.register { a, _ ->
-            a.register(literal("sfhelp").executes {
-                ChatUtils.messageToChat(
-                    "§9---------------------------------------------------\n" +
-                            "§f/sf - Open the SkyFall config GUI\n" +
-                            "§f/sfcolor - Display the color codes\n" +
-                            "§f/sfhelp - Display this help message\n" +
-                    "§9---------------------------------------------------"
-                ).send()
-                1
-            })
-        }
-    }
-
-    fun sfcommandtest() {
-
-        Command.register { dispatcher, _ ->
-            dispatcher.register(literal("sfcommandtest").executes { context ->
-
-                println("Executing /sfcommandtest for player: ${context.source.player}")
-
-                ChatUtils.messageToChat("This is an info message example.")
-
-                ChatUtils.warning("This is a warning message example. Be aware!")
-
-                ChatUtils.error("This is an error message. Click me to copy this text.")
-
-                ChatUtils.error(
-                    errorMessage = "Another error. Click to copy '/skyfall help errors'.",
-                    copyableText = "/skyfall help errors"
                 )
-
-                ChatUtils.messageToChat("All test messages have been sent successfully!")
-
-                ChatUtils.messageToChat("Click me to copy!")
-                    .copyContent("This is the text to copy")
-                    .send()
-
-                ChatUtils.messageToChat("Click me to run a command!")
-                    .clickToRun("/help")
-                    .send()
-
                 1
             })
         }

src/main/kotlin/io/github/frostzie/skyfall/commands/CommandManager.kt

@@ -7,8 +7,6 @@ object CommandManager {
         // Always On Commands
         AlwaysOnCommands.openConfig()
         AlwaysOnCommands.sfColor()
-        AlwaysOnCommands.sfHelp()
-        AlwaysOnCommands.sfcommandtest()
 
         // Dungeon Commands
         ShortCommands.registerCommands()

…e/skyfall/config/gui/ConfigGuiManager.kt …stzie/skyfall/config/ConfigGuiManager.ktsrc/main/kotlin/io/github/frostzie/skyfall/config/gui/ConfigGuiManager.kt renamed to src/main/kotlin/io/github/frostzie/skyfall/config/ConfigGuiManager.kt src/main/kotlin/io/github/frostzie/skyfall/config/gui/ConfigGuiManager.kt renamed to src/main/kotlin/io/github/frostzie/skyfall/config/ConfigGuiManager.kt

@@ -1,7 +1,6 @@
-package io.github.frostzie.skyfall.config.gui
+package io.github.frostzie.skyfall.config
 
 import io.github.frostzie.skyfall.SkyFall
-import io.github.frostzie.skyfall.config.Features
 import io.github.notenoughupdates.moulconfig.gui.GuiElementWrapper
 import io.github.notenoughupdates.moulconfig.gui.MoulConfigEditor
 import net.minecraft.client.gui.screen.Screen
@@ -11,7 +10,7 @@ object ConfigGuiManager {
 
     fun getEditorInstance(): MoulConfigEditor<Features> {
         if (editor == null) {
-            editor = MoulConfigEditor(SkyFall.configManager.processor)
+            editor = MoulConfigEditor(SkyFall.Companion.configManager.processor)
         }
         return editor!!
     }
@@ -21,7 +20,7 @@ object ConfigGuiManager {
         if (search != null) {
             currentEditor.search(search)
         }
-        SkyFall.screenToOpen = GuiElementWrapper(currentEditor)
+        SkyFall.Companion.screenToOpen = GuiElementWrapper(currentEditor)
     }
 
     fun createModMenuScreen(parentScreenFromModMenu: Screen): Screen {

src/main/kotlin/io/github/frostzie/skyfall/config/Features.kt

@@ -6,6 +6,7 @@ import io.github.frostzie.skyfall.config.features.dev.DevConfig
 import io.github.frostzie.skyfall.config.features.dungeon.DungeonConfig
 import io.github.frostzie.skyfall.config.features.garden.GardenConfig
 import io.github.frostzie.skyfall.config.features.gui.GuiConfig
+import io.github.frostzie.skyfall.config.features.inventory.InventoryConfig
 import io.github.frostzie.skyfall.config.features.misc.MiscConfig
 import io.github.notenoughupdates.moulconfig.Config
 import io.github.notenoughupdates.moulconfig.Social
@@ -48,6 +49,10 @@ class Features : Config() {
     @Category(name = "Garden", desc = "Garden related features")
     var garden: GardenConfig = GardenConfig()
 
+    @Expose
+    @Category(name = "Inventory", desc = "Inventory related features")
+    var inventory: InventoryConfig = InventoryConfig()
+
     @Expose
     @Category(name = "Misc", desc = "Miscellaneous features")
     var miscFeatures: MiscConfig = MiscConfig()