1.18.1 update

update to 1.18.1 (+potential accidental disable of hotbar saving? dunno, and too scared to test)

Author: Lord-Memester

README.md

@@ -1,6 +1,6 @@
 # More Toolbars
 
-Fabric Mod which adds 18 more toolbars! This mod needs Fabric API to work properly. Current version is for Minecraft 1.15.2.
+Fabric Mod which adds 18 more toolbars! This mod needs Fabric API to work properly. Current version is for Minecraft 1.18.1.
 
 # Compile
 

build.gradle

@@ -1,77 +1,72 @@
 plugins {
-	id 'fabric-loom' version '0.4-SNAPSHOT'
+	id 'fabric-loom' version '0.11-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+repositories {
+	// Add repositories to retrieve artifacts from in here.
+	// You should only use this when depending on other mods because
+	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
+	// for more information about repositories.
+}
+
 dependencies {
-	//to change the versions see the gradle.properties file
+	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-	// You may need to force-disable transitiveness on them.
 }
 
 processResources {
 	inputs.property "version", project.version
 
-	from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
+	filesMatching("fabric.mod.json") {
 		expand "version": project.version
 	}
-
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
-	}
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
+tasks.withType(JavaCompile).configureEach {
+	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	it.options.release = 17
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
-	from sourceSets.main.allSource
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
 }
 
 jar {
-	from "LICENSE"
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
 }
 
 // configure the maven publication
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
-			// add all the jars that should be included when publishing to maven
-			artifact(remapJar) {
-				builtBy remapJar
-			}
-			artifact(sourcesJar) {
-				builtBy remapSourcesJar
-			}
+			from components.java
 		}
 	}
 
-	// select the repositories you want to publish to
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
 	repositories {
-		// uncomment to publish to the local maven
-		// mavenLocal()
+		// Add repositories to publish to here.
+		// Notice: This block does NOT have the same function as the block in the top level.
+		// The repositories here will be used for publishing your artifact, not for
+		// retrieving dependencies.
 	}
-}
+}

gradle.properties

@@ -2,16 +2,15 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.3
-	yarn_mappings=1.16.3+build.11
-	loader_version=0.9.3+build.207
+# check these on https://fabricmc.net/develop
+minecraft_version=1.18.1
+yarn_mappings=1.18.1+build.22
+loader_version=0.12.12
 
 # Mod Properties
 	mod_version = 1.0.4
 	maven_group = io.github.samipourquoi
 	archives_base_name = more-toolbars
 
 # Dependencies
-	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.21.0+build.407-1.16
+fabric_version=0.46.2+1.18

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Sep 13 03:05:51 CEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

remappedSrc/io/github/samipourquoi/moretoolbars/Keybinds.java

@@ -0,0 +1,50 @@
+package io.github.samipourquoi.moretoolbars;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding;
+import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.util.InputUtil;
+import net.minecraft.util.Identifier;
+import org.lwjgl.glfw.GLFW;
+
+/**
+ * Adds the keybinds for the modifiers of each group.
+ *
+ * @author samipourquoi
+ */
+@Environment(EnvType.CLIENT)
+public class Keybinds implements ModInitializer {
+
+    public static KeyBinding group1;
+    public static KeyBinding group2;
+    public static KeyBinding group3;
+
+    @Override
+    public void onInitialize() {
+
+        group1 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
+                "key.moretoolbars.group1",
+                InputUtil.Type.KEYSYM,
+                InputUtil.UNKNOWN_KEY.getCode(),
+                "key.categories.creative"
+        ));
+
+        group2 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
+                "key.moretoolbars.group2",
+                InputUtil.Type.KEYSYM,
+                GLFW.GLFW_KEY_LEFT_ALT,
+                "key.categories.creative"
+        ));
+
+        group3 = KeyBindingHelper.registerKeyBinding(new KeyBinding(
+                "key.moretoolbars.group3",
+                InputUtil.Type.KEYSYM,
+                GLFW.GLFW_KEY_LEFT_SUPER,
+                "key.categories.creative"
+        ));
+    }
+}

remappedSrc/io/github/samipourquoi/moretoolbars/mixin/MixinCreativeInventoryScreen.java

@@ -0,0 +1,149 @@
+package io.github.samipourquoi.moretoolbars.mixin;
+
+import io.github.samipourquoi.moretoolbars.Keybinds;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen;
+import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
+import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.client.option.HotbarStorage;
+import net.minecraft.client.option.HotbarStorageEntry;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.text.OrderedText;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.injection.*;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Environment(EnvType.CLIENT)
+@Mixin(CreativeInventoryScreen.class)
+public abstract class MixinCreativeInventoryScreen extends AbstractInventoryScreen<CreativeInventoryScreen.CreativeScreenHandler> {
+
+    public MixinCreativeInventoryScreen(CreativeInventoryScreen.CreativeScreenHandler container, PlayerInventory playerInventory, Text text) {
+        super(container, playerInventory, text);
+    }
+
+    /**
+     * @author samipourquoi
+     */
+    @Overwrite
+    public static void onHotbarKeyPress(MinecraftClient client, int index, boolean restore, boolean save) {
+        ClientPlayerEntity clientPlayerEntity = client.player;
+        HotbarStorage hotbarStorage = client.getCreativeHotbarStorage();
+        HotbarStorageEntry hotbarStorageEntry = hotbarStorage.getSavedHotbar(index);
+        int j;
+        if (clientPlayerEntity == null) return;
+        if (restore) {
+            for(j = 0; j < PlayerInventory.getHotbarSize(); j++) {
+                ItemStack itemStack = ((ItemStack)hotbarStorageEntry.get(j)).copy();
+                clientPlayerEntity.inventory.setStack(j, itemStack);
+                client.interactionManager.clickCreativeStack(itemStack, 36 + j);
+            }
+
+            clientPlayerEntity.playerScreenHandler.sendContentUpdates();
+        } else if (save) {
+            for(j = 0; j < PlayerInventory.getHotbarSize(); j++) {
+                hotbarStorageEntry.set(j, clientPlayerEntity.inventory.getStack(j).copy());
+            }
+
+            String hotbarKey = getTranslationName(client.options.keysHotbar[index % 9]);
+            String restoreKey = getTranslationName(client.options.keyLoadToolbarActivator);
+            String[] modifiers = {
+                    (Keybinds.group1.isUnbound()) ? "" : getTranslationName(Keybinds.group1) + "+",
+                    (Keybinds.group2.isUnbound()) ? "" : getTranslationName(Keybinds.group2) + "+",
+                    (Keybinds.group3.isUnbound()) ? "" : getTranslationName(Keybinds.group3) + "+",
+            };
+
+            TranslatableText originalText = new TranslatableText("inventory.hotbarSaved", modifiers[index/9] + restoreKey, hotbarKey);
+
+            client.inGameHud.setOverlayMessage((Text) originalText, false);
+            hotbarStorage.save();
+        }
+    }
+
+    private static String getTranslationName(KeyBinding key) {
+        String a = new TranslatableText(key.getBoundKeyTranslationKey()).asString();
+        String b = key.getBoundKeyLocalizedText().getString();
+        return (b.equals("")) ? a : b;
+    }
+
+    /**
+     * Cancels the render of the saved toolbars.
+     */
+    @ModifyConstant(
+        method = "setSelectedTab",
+        slice = @Slice(
+            from = @At(
+                value = "HEAD"
+            ),
+            to = @At(
+                value = "INVOKE",
+                target = "Lnet/minecraft/client/options/HotbarStorage;getSavedHotbar(I)Lnet/minecraft/client/options/HotbarStorageEntry;"
+            )
+        ),
+        constant = @Constant(intValue = 9)
+    )
+    private int noOldRenderSavedToolbars(int number) {
+        return 0;
+    }
+
+    /**
+     * "Overwrites" the render of the saved toolbars.
+     */
+    @Inject(
+            method = "setSelectedTab",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/MinecraftClient;getCreativeHotbarStorage()Lnet/minecraft/client/options/HotbarStorage;"
+            )
+    )
+    private void renderSavedToolbars(ItemGroup group, CallbackInfo info) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        HotbarStorage hotbarStorage = client.getCreativeHotbarStorage();
+        Item[] displayItems = {Items.PAPER, Items.MAP, Items.FILLED_MAP};
+        int displayItemIndex = 0;
+        String[] modifiers = {
+                (Keybinds.group1.isUnbound()) ? "" : getTranslationName(Keybinds.group1) + "+",
+                (Keybinds.group2.isUnbound()) ? "" : getTranslationName(Keybinds.group2) + "+",
+                (Keybinds.group3.isUnbound()) ? "" : getTranslationName(Keybinds.group3) + "+",
+        };
+
+        for(int i = 0; i < 27; i++) {
+            HotbarStorageEntry hotbarStorageEntry = hotbarStorage.getSavedHotbar(i);
+            String hotbarKey;
+            String saveKey;
+
+            if ((i % 9 == 0) && i != 0) displayItemIndex++;
+            if (hotbarStorageEntry.isEmpty()) {
+
+                for(int j = 0; j < 9; j++) {
+                    if (i % 9 == j) {
+                        ItemStack itemStack = new ItemStack(displayItems[displayItemIndex]);
+                        itemStack.getOrCreateSubTag("CustomCreativeLock");
+
+                        hotbarKey = getTranslationName(client.options.keysHotbar[j]);
+                        saveKey = getTranslationName(client.options.keySaveToolbarActivator);
+                        itemStack.setCustomName(new TranslatableText(
+                                "inventory.hotbarInfo",
+                                modifiers[displayItemIndex]+saveKey,
+                                hotbarKey
+                        ));
+                        this.getScreenHandler().itemList.add(itemStack);
+                    } else {
+                        this.getScreenHandler().itemList.add(ItemStack.EMPTY);
+                    }
+                }
+            } else {
+                this.getScreenHandler().itemList.addAll(hotbarStorageEntry);
+            }
+        }
+    }
+}

remappedSrc/io/github/samipourquoi/moretoolbars/mixin/MixinHotbarStorage.java

@@ -0,0 +1,36 @@
+package io.github.samipourquoi.moretoolbars.mixin;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.options.HotbarStorage;
+import net.minecraft.client.options.HotbarStorageEntry;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+/**
+ * Changes some variables to make them compatible with 27 toolbars.
+ *
+ * @author samipourquoi
+ */
+@Environment(EnvType.CLIENT)
+@Mixin(HotbarStorage.class)
+public class MixinHotbarStorage {
+    @Final public HotbarStorageEntry[] entries = new HotbarStorageEntry[27];
+
+    @ModifyConstant(method = "<init>", constant = @Constant(intValue = 9))
+    private int constructor(int number) {
+        return 27;
+    }
+
+    @ModifyConstant(method = "load", constant = @Constant(intValue = 9))
+    private int load(int number) {
+        return 27;
+    }
+
+    @ModifyConstant(method = "save", constant = @Constant(intValue = 9))
+    private int save(int number) {
+        return 27;
+    }
+}