Update to 1.19.3

Author: strikerrocker

build.gradle

@@ -15,7 +15,7 @@ repositories {
 }
 
 version = project.mod_version
-archivesBaseName = project.mod_name + '-' + project.minecraft_version
+archivesBaseName = project.mod_name + '-forge-' + project.minecraft_version
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 

gradle.properties

@@ -2,7 +2,7 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-minecraft_version=1.19.2
-forge_version=43.1.47
-mod_version=1.0.9
+minecraft_version=1.19.3
+forge_version=44.0.6
+mod_version=1.0.10
 mod_name=SBM-Magic-Mirror

src/main/java/io/github/strikerrocker/magicmirror/MagicMirror.java

@@ -5,18 +5,25 @@
 import io.github.strikerrocker.magicmirror.mirror.MirrorItem;
 import io.github.strikerrocker.magicmirror.mirror.MirrorSubType;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.CreativeModeTabs;
+import net.minecraft.world.item.Item;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityManager;
 import net.minecraftforge.common.capabilities.CapabilityToken;
 import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
+import net.minecraftforge.event.CreativeModeTabEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLPaths;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegisterEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Mod.EventBusSubscriber(modid = MagicMirror.DOMAIN, bus = Mod.EventBusSubscriber.Bus.MOD)
 @Mod(value = MagicMirror.DOMAIN)
 public class MagicMirror {
@@ -28,8 +35,11 @@ public class MagicMirror {
     public static Capability<IMirrorData> CAPABILITY_MIRROR = CapabilityManager.get(new CapabilityToken<>() {
     });
 
+    public static List<Item> MIRRORS = new ArrayList<>();
+
     public MagicMirror() {
         Config.loadConfig(Config.SERVER_CONFIG, FMLPaths.CONFIGDIR.get().resolve("magic_mirror.toml"));
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(MagicMirror::itemGroup);
     }
 
     @SubscribeEvent
@@ -41,10 +51,17 @@ public static void capabilityRegisterEvent(RegisterCapabilitiesEvent event) {
     public static void registerItem(RegisterEvent registry) {
         if (registry.getRegistryKey().equals(ForgeRegistries.Keys.ITEMS)) {
             for (MirrorSubType type : MirrorSubType.values()) {
+                Item mirror = new MirrorItem(type);
                 registry.register(ForgeRegistries.Keys.ITEMS,
                         new ResourceLocation(DOMAIN, "magicmirror_" + type.toString().toLowerCase()),
-                        () -> new MirrorItem(type));
+                        () -> mirror);
+                MIRRORS.add(mirror);
             }
         }
     }
+
+    public static void itemGroup(CreativeModeTabEvent.BuildContents event) {
+        if (event.getTab() == CreativeModeTabs.TOOLS_AND_UTILITIES) MIRRORS.forEach(event::accept);
+    }
+
 }

src/main/java/io/github/strikerrocker/magicmirror/mirror/MirrorItem.java

@@ -13,7 +13,10 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.*;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Rarity;
+import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
 
 import javax.annotation.Nullable;
@@ -35,7 +38,7 @@ public class MirrorItem extends Item {
     public MirrorState currentMirrorState = MirrorState.DEFAULT;
 
     public MirrorItem(MirrorSubType type) {
-        super(new Properties().stacksTo(1).tab(CreativeModeTab.TAB_TOOLS));
+        super(new Properties().stacksTo(1));
         ItemProperties.register(this, new ResourceLocation(MagicMirror.DOMAIN, "state"), (stack, world, entity, no) -> entity instanceof Player ? getState((Player) entity) : 0);
     }
 

src/main/resources/META-INF/mods.toml

@@ -14,13 +14,13 @@ description = '''Mirror like object that is used to quickly get to the surface a
 [[dependencies.sbmmagicmirror]] #optional
 modId = "forge"
 mandatory = true
-versionRange = "[41,)"
+versionRange = "[44,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.sbmmagicmirror]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19,)"
+versionRange = "[1.19.3,)"
 ordering = "NONE"
 side = "BOTH"

src/main/resources/assets/sbmmagicmirror/models/item/magicmirror_diamond.json

@@ -1,7 +1,7 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "sbmmagicmirror:items/diamond_clean"
+    "layer0": "sbmmagicmirror:item/diamond_clean"
   },
   "overrides": [
     {

src/main/resources/assets/sbmmagicmirror/models/item/magicmirror_diamond_blank.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "sbmmagicmirror:items/diamond_clean"
+    "layer0": "sbmmagicmirror:item/diamond_clean"
   }
 }

src/main/resources/assets/sbmmagicmirror/models/item/magicmirror_diamond_dirty.json

@@ -1,7 +1,7 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "sbmmagicmirror:items/diamond_dirty"
+    "layer0": "sbmmagicmirror:item/diamond_dirty"
   },
   "overrides": [
     {

src/main/resources/assets/sbmmagicmirror/models/item/magicmirror_diamond_dirty_blank.json

@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "sbmmagicmirror:items/diamond_dirty"
+    "layer0": "sbmmagicmirror:item/diamond_dirty"
   }
 }

src/main/resources/assets/sbmmagicmirror/models/item/magicmirror_diamond_dirty_glow.json

@@ -1,7 +1,7 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "sbmmagicmirror:items/diamond_dirty",
-    "layer1": "sbmmagicmirror:items/glow"
+    "layer0": "sbmmagicmirror:item/diamond_dirty",
+    "layer1": "sbmmagicmirror:item/glow"
   }
 }