Updated the Library to fully work with 1.19.3

CodeCraftPlugin · CodeCraftPlugin · commit 2361d8658559 · 2023-02-07T17:42:03.000+05:30
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,44 +1,44 @@
-#name: "Build Release"
-#on: push
-#jobs:
-#  build:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - { uses: actions/checkout@v2, with: { fetch-depth: 0 } }
-#      - {
-#        name: "Set up JDK 17",
-#        uses: actions/setup-java@v2,
-#        with: { distribution: "temurin", java-version: "17" },
-#      }
-#      - {
-#        name: "Build with Gradle",
-#        id: build,
-#        run: "chmod +x gradlew && ./gradlew build publish",
-#      }
-#      - name: Create Release
-#        id: create_release
-#        uses: actions/create-release@v1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-#        with:
-#          tag_name: ${{ steps.build.outputs.version }}
-#          release_name: Release registry-lib-${{ steps.build.outputs.version }}
-#      - name: Upload Release Asset
-#        id: upload-release-asset
-#        uses: actions/upload-release-asset@v1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: "build/libs/registry-lib-${{ steps.build.outputs.version }}.jar"
-#          asset_name: "registry-lib-${{ steps.build.outputs.version }}.jar"
-#          asset_content_type: application/java-archive
-#      - name: Upload to CurseForge
-#        uses: itsmeow/curseforge-upload@3.1.1
-#        with:
-#          file_path: "build/libs/registry-lib-${{ steps.build.outputs.version }}.jar"
-#          game_endpoint: "minecraft"
-#          relations: "fabric-api:requiredDependency,modmenu:optionalDependency"
-#          token: ${{ secrets.CF_API_TOKEN }}
-#          game_version: "Minecraft 1.19:1.19.3,Java 17,Fabric,Client,Server"
-#          #project_id: ""
+name: "Build Release"
+on: push
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - { uses: actions/checkout@v2, with: { fetch-depth: 0 } }
+      - {
+        name: "Set up JDK 17",
+        uses: actions/setup-java@v2,
+        with: { distribution: "temurin", java-version: "17" },
+      }
+      - {
+        name: "Build with Gradle",
+        id: build,
+        run: "chmod +x gradlew && ./gradlew build",
+      }
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ steps.build.outputs.version }}
+          release_name: Release registry-lib-${{ steps.build.outputs.version }}
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: "build/libs/registry-lib-${{ steps.build.outputs.version }}.jar"
+          asset_name: "registry-lib-${{ steps.build.outputs.version }}.jar"
+          asset_content_type: application/java-archive
+      - name: Upload to CurseForge
+        uses: itsmeow/curseforge-upload@3.1.1
+        with:
+          file_path: "build/libs/registry-lib-${{ steps.build.outputs.version }}.jar"
+          game_endpoint: "minecraft"
+          relations: "fabric-api:requiredDependency,modmenu:optionalDependency"
+          token: ${{ secrets.CF_API_TOKEN }}
+          game_version: "Minecraft 1.19:1.19.3,Java 17,Fabric,Client,Server"
+          project_id: "776484"
diff --git a/build.gradle b/build.gradle
@@ -122,4 +122,6 @@ project.plugins.withType(MavenPublishPlugin).all {
     }
 }
 
-
+exec {
+    commandLine "echo", "##[set-output name=version;]${project.version}";
+}
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ minecraft_version=1.19.3
 yarn_mappings=1.19.3+build.5
 loader_version=0.14.13
 # Mod Properties
-mod_version=1.19.2-1.0.1
+mod_version=1.19.3-1.0.1
 maven_group=io.github.codecraftplugin
 archives_base_name=registry-lib
 # Dependencies
diff --git a/src/main/java/io/github/codecraftplugin/registrylib/RegisteryLib.java b/src/main/java/io/github/codecraftplugin/registrylib/RegisteryLib.java
@@ -5,6 +5,7 @@
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemGroups;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,6 +15,6 @@ public class RegisteryLib implements ModInitializer {
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
     @Override
     public void onInitialize() {
-        Registry.registerItems("registeritem",MOD_ID,new Item(new FabricItemSettings().group(ItemGroup.MISC)));
+        Item registeritem = Registry.registerItems("registeritem",MOD_ID,new Item(new FabricItemSettings()), ItemGroups.TOOLS);;
     }
 }
diff --git a/src/main/java/io/github/codecraftplugin/registrylib/utils/EntityRegistryBuilder.java b/src/main/java/io/github/codecraftplugin/registrylib/utils/EntityRegistryBuilder.java
@@ -7,11 +7,14 @@
 import net.minecraft.entity.EntityType.EntityFactory;
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.Item.Settings;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemGroups;
 import net.minecraft.item.SpawnEggItem;
+import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.registry.Registry;
 
 public class EntityRegistryBuilder<E extends Entity> {
     private static Identifier name;
@@ -85,13 +88,15 @@ public EntityType<E> build() {
                     .forceTrackedVelocityUpdates(this.alwaysUpdateVelocity).build();
         }
 
-        EntityType<E> entityType = Registry.register(Registry.ENTITY_TYPE, name, entityBuilder.build(name.getPath()));
+        EntityType<E> entityType = Registry.register(Registries.ENTITY_TYPE, name, entityBuilder.build(name.getPath()));
 
         if (this.hasEgg) {
-            io.github.codecraftplugin.registrylib.utils.Registry.registerEgg(
+            Item spawn_egg  = io.github.codecraftplugin.registrylib.utils.Registry.registerEgg(
                     new SpawnEggItem((EntityType<? extends MobEntity>) entityType, this.primaryColor, this.secondaryColor,
-                            (new Settings()).group(ItemGroup.MISC)),
+                            (new Settings())),
                     new Identifier(name.getNamespace(), String.format("%s_spawn_egg", name.getPath())));
+
+            io.github.codecraftplugin.registrylib.utils.Registry.addToItemGroup(ItemGroups.SPAWN_EGGS,spawn_egg);
         }
 
         return entityType;
diff --git a/src/main/java/io/github/codecraftplugin/registrylib/utils/Registry.java b/src/main/java/io/github/codecraftplugin/registrylib/utils/Registry.java
@@ -1,6 +1,7 @@
 package io.github.codecraftplugin.registrylib.utils;
 
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
@@ -13,26 +14,33 @@
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemGroups;
+import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 
 
 public class Registry {
 
 
-    public static Item registerItems(String name, String MOD_ID, Item item){
-        return net.minecraft.util.registry.Registry.register(net.minecraft.util.registry.Registry.ITEM,new Identifier(MOD_ID,name),item);
+    public static Item registerItems(String name, String MOD_ID, Item item, ItemGroup itemGroup){
+        Item createditem = net.minecraft.registry.Registry.register(Registries.ITEM,new Identifier(MOD_ID,name),item);
+        addToItemGroup(itemGroup,createditem);
+        return createditem;
     }
     public static Block registerBlocks(String name, String MOD_ID, Block block, ItemGroup itemGroup){
         registerBlockItem(name,MOD_ID,block,itemGroup);
-        return net.minecraft.util.registry.Registry.register(net.minecraft.util.registry.Registry.BLOCK,new Identifier(MOD_ID,name),block);
+        return net.minecraft.registry.Registry.register(Registries.BLOCK,new Identifier(MOD_ID,name),block);
     }
     public static Item registerBlockItem(String name, String MOD_ID, Block block, ItemGroup itemGroup) {
-        return net.minecraft.util.registry.Registry.register(net.minecraft.util.registry.Registry.ITEM,new Identifier(MOD_ID,name),
-                new BlockItem(block,new FabricItemSettings().group(itemGroup)));
+        return net.minecraft.registry.Registry.register(Registries.ITEM,new Identifier(MOD_ID,name),
+                new BlockItem(block,new FabricItemSettings()));
     }
+    //Adds Group to the items created
 
-
+    public static void addToItemGroup(ItemGroup group, Item item) {
+        ItemGroupEvents.modifyEntriesEvent(group).register(entries -> entries.add(item));
+    }
     /**
      * Register blocks without block item block.
      *
@@ -43,12 +51,12 @@ public static Item registerBlockItem(String name, String MOD_ID, Block block, It
      */
     public static Block registerBlocksWithoutBlockItem(String name, String MOD_ID, Block block){
         //register the block without block items, so you have to register it manually using registerItems
-        return net.minecraft.util.registry.Registry.register(net.minecraft.util.registry.Registry.BLOCK,new Identifier(MOD_ID,name),block);
+        return net.minecraft.registry.Registry.register(Registries.BLOCK,new Identifier(MOD_ID,name),block);
     }
 
     //register enchantments
     public static Enchantment registerEnchantments(String name, Enchantment enchantment, String MOD_ID){
-        return net.minecraft.util.registry.Registry.register(net.minecraft.util.registry.Registry.ENCHANTMENT, new Identifier(MOD_ID, name),enchantment);
+        return net.minecraft.registry.Registry.register(Registries.ENCHANTMENT, new Identifier(MOD_ID, name),enchantment);
 
     }
 
@@ -60,7 +68,7 @@ public static Enchantment registerEnchantments(String name, Enchantment enchantm
      * @return
      */
     private static FlowableFluid registerFluids(String name, String MOD_ID,FlowableFluid flowableFluid) {
-        return net.minecraft.util.registry.Registry.register(net.minecraft.util.registry.Registry.FLUID, new Identifier(MOD_ID, name), flowableFluid);
+        return net.minecraft.registry.Registry.register(Registries.FLUID, new Identifier(MOD_ID, name), flowableFluid);
     }
     public static void registerRegistry(Logger logger){
         logger.info("registered all the registry");
@@ -75,11 +83,11 @@ public static void registerRegistry(Logger logger){
      * @return The Entity
      */
     public static EntityType registerEntity(String name,String MOD_ID, EntityType entity){
-        return net.minecraft.util.registry.Registry.register(net.minecraft.util.registry.Registry.ENTITY_TYPE, new Identifier(MOD_ID,name),entity);
+        return net.minecraft.registry.Registry.register(Registries.ENTITY_TYPE, new Identifier(MOD_ID,name),entity);
     }
     //register status effects
     public static StatusEffect registerStatusEffects(String name,String MOD_ID, StatusEffect statusEffect){
-        return net.minecraft.util.registry.Registry.register(net.minecraft.util.registry.Registry.STATUS_EFFECT, new Identifier(MOD_ID, name), statusEffect);
+        return net.minecraft.registry.Registry.register(Registries.STATUS_EFFECT, new Identifier(MOD_ID, name), statusEffect);
     }
     //register entities with spawn egg
     public static <T extends Entity> EntityType<T> buildEntity(EntityType.EntityFactory<T> entity, Class<T> entityClass,
@@ -102,7 +110,7 @@ public static <T extends Entity> EntityType<T> buildEntity(EntityType.EntityFact
      */
     public static <I extends Item> I registerEgg(I item, Identifier name) {
         if (FabricLoader.getInstance().isDevelopmentEnvironment()) {
-            return net.minecraft.util.registry.Registry.register(net.minecraft.util.registry.Registry.ITEM, name, item);
+            return net.minecraft.registry.Registry.register(Registries.ITEM, name, item);
         }
         return null;
     }

Original file line number	Diff line number	Diff line change
`@@ -122,4 +122,6 @@ project.plugins.withType(MavenPublishPlugin).all {`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`-`
	`125`	`+exec {`
	`126`	`+ commandLine "echo", "##[set-output name=version;]${project.version}";`
	`127`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import net.fabricmc.fabric.api.item.v1.FabricItemSettings;`
`6`	`6`	`import net.minecraft.item.Item;`
`7`	`7`	`import net.minecraft.item.ItemGroup;`
	`8`	`+import net.minecraft.item.ItemGroups;`
`8`	`9`	`import org.slf4j.Logger;`
`9`	`10`	`import org.slf4j.LoggerFactory;`
`10`	`11`
`@@ -14,6 +15,6 @@ public class RegisteryLib implements ModInitializer {`
`14`	`15`	`public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);`
`15`	`16`	`@Override`
`16`	`17`	`public void onInitialize() {`
`17`		`- Registry.registerItems("registeritem",MOD_ID,new Item(new FabricItemSettings().group(ItemGroup.MISC)));`
	`18`	`+ Item registeritem = Registry.registerItems("registeritem",MOD_ID,new Item(new FabricItemSettings()), ItemGroups.TOOLS);;`
`18`	`19`	`}`
`19`	`20`	`}`