version upgrade

build.gradle

@@ -25,7 +25,7 @@ dependencies {
 	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
-	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 	
 }
 

gradle.properties

@@ -7,14 +7,14 @@ org.gradle.configuration-cache=false
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=26.1-snapshot-1
+minecraft_version=26.1-snapshot-2
-loader_version=0.18.3
+loader_version=0.18.4
 loom_version=1.14-SNAPSHOT
 
 # Mod Properties
-mod_version=26.1.0
+mod_version=26.1.1
 maven_group=de.jottyfan.minecraft
 archives_base_name=quickly
 
 # Dependencies
-fabric_version=0.140.2+26.1
+fabric_api_version=0.141.2+26.1

src/main/java/de/jottyfan/minecraft/Quickly.java

@@ -10,7 +10,6 @@ import de.jottyfan.minecraft.event.QuicklyEvents;
 import de.jottyfan.minecraft.feature.QuicklyFeatures;
 import de.jottyfan.minecraft.item.QuicklyItems;
 import de.jottyfan.minecraft.loot.QuicklyLootTables;
-import de.jottyfan.minecraft.tab.QuicklyTab;
 import net.fabricmc.api.ModInitializer;
 /**
  *
@@ -26,7 +25,6 @@ public class Quickly implements ModInitializer {
 	public void onInitialize() {
 		LOGGER.info("loading {}", MOD_ID);
 
-		QuicklyTab.registerItemGroup();
 		QuicklyItems.registerModItems();
 		QuicklyBlocks.registerModBlocks();
 		QuicklyBlockEntity.registerBlockEntities();

src/main/java/de/jottyfan/minecraft/QuicklyClient.java

@@ -1,9 +1,6 @@
 package de.jottyfan.minecraft;
 
-import de.jottyfan.minecraft.block.QuicklyBlocks;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
-import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
 
 /**
  *
@@ -14,7 +11,5 @@ public class QuicklyClient implements ClientModInitializer {
 
 	@Override
 	public void onInitializeClient() {
-		BlockRenderLayerMap.putBlock(QuicklyBlocks.COTTONPLANT, ChunkSectionLayer.CUTOUT);
-		BlockRenderLayerMap.putBlock(QuicklyBlocks.CANOLAPLANT, ChunkSectionLayer.CUTOUT);
 	}
 }

src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java

@@ -4,8 +4,6 @@ import java.util.function.Function;
 
 import de.jottyfan.minecraft.Quickly;
 import de.jottyfan.minecraft.item.QuicklyItems;
-import de.jottyfan.minecraft.tab.QuicklyTab;
-import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
@@ -96,29 +94,5 @@ public class QuicklyBlocks {
 	}
 
 	public static void registerModBlocks() {
-		ItemGroupEvents.modifyEntriesEvent(QuicklyTab.QUICKLY_TAB).register(block -> {
-			block.accept(KELPBUNDLE);
-			block.accept(TURQUOISEBLOCK);
-			block.accept(DIRTSALPETER);
-			block.accept(SANDSALPETER);
-			block.accept(ORESALPETER);
-			block.accept(ORESULFOR);
-			block.accept(ORETURQUOISE);
-			block.accept(ORESPEEDPOWDER);
-			block.accept(ORESANDSALPETER);
-			block.accept(OREDEEPSLATETURQUOISE);
-			block.accept(OREDEEPSLATESULFOR);
-			block.accept(OREDEEPSLATESPEEDPOWDER);
-			block.accept(ORENETHERSULFOR);
-			block.accept(SPEEDPOWDER);
-			block.accept(QUICKIEPOWDER);
-			block.accept(MONSTERHOARDER);
-			block.accept(ITEMHOARDER);
-			block.accept(LAVAHOARDER);
-			block.accept(DRILL);
-			block.accept(STACKER);
-			block.accept(SALPETERBLOCK);
-			block.accept(SULFORBLOCK);
-		});
 	}
 }

src/main/java/de/jottyfan/minecraft/composter/QuicklyComposter.java

@@ -1,7 +1,7 @@
 package de.jottyfan.minecraft.composter;
 
 import de.jottyfan.minecraft.item.QuicklyItems;
-import net.fabricmc.fabric.api.registry.CompostingChanceRegistry;
+import net.fabricmc.fabric.api.registry.CompostableRegistry;
 
 /**
  *
@@ -11,10 +11,10 @@ import net.fabricmc.fabric.api.registry.CompostingChanceRegistry;
 public class QuicklyComposter {
 
 	public static final void registerComposterItems() {
-		CompostingChanceRegistry.INSTANCE.add(QuicklyItems.COTTONSEED, 0.5f);
+		CompostableRegistry.INSTANCE.add(QuicklyItems.COTTONSEED, 0.5f);
-		CompostingChanceRegistry.INSTANCE.add(QuicklyItems.COTTON, 0.75f);
+		CompostableRegistry.INSTANCE.add(QuicklyItems.COTTON, 0.75f);
-		CompostingChanceRegistry.INSTANCE.add(QuicklyItems.CANOLASEED, 0.5f);
+		CompostableRegistry.INSTANCE.add(QuicklyItems.CANOLASEED, 0.5f);
-		CompostingChanceRegistry.INSTANCE.add(QuicklyItems.CANOLA, 0.75f);
+		CompostableRegistry.INSTANCE.add(QuicklyItems.CANOLA, 0.75f);
 	}
 
 }

src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java

@@ -3,8 +3,6 @@ package de.jottyfan.minecraft.item;
 import java.util.function.Function;
 
 import de.jottyfan.minecraft.Quickly;
-import de.jottyfan.minecraft.tab.QuicklyTab;
-import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
@@ -99,46 +97,5 @@ public class QuicklyItems {
 	}
 
 	public static final void registerModItems() {
-		ItemGroupEvents.modifyEntriesEvent(QuicklyTab.QUICKLY_TAB).register(item -> {
-			item.accept(STUB);
-			item.accept(COTTON);
-			item.accept(COTTONSEED);
-			item.accept(ROTTENFLESHSTRIPES);
-			item.accept(CARROTSTACK);
-			item.accept(CANOLA);
-			item.accept(CANOLASEED);
-			item.accept(CANOLABOTTLE);
-			item.accept(CANOLABOTTLESTACK);
-			item.accept(RAWTURQUOISE);
-			item.accept(SPEEDPOWDER);
-			item.accept(QUICKIEPOWDER);
-			item.accept(TURQUOISEINGOT);
-			item.accept(SPEEDINGOT);
-			item.accept(QUICKIEINGOT);
-			item.accept(COPPERPOWDER);
-			item.accept(OXIDIZEDCOPPERPOWDER);
-			item.accept(COPPERSTRING);
-			item.accept(COPPERSTICK);
-			item.accept(COPPERSTUB);
-			item.accept(SALPETER);
-			item.accept(SULFOR);
-			item.accept(MAGNIFIER);
-			item.accept(ARMOR_TURQUOISE_HELMET);
-			item.accept(ARMOR_TURQUOISE_CHESTPLATE);
-			item.accept(ARMOR_TURQUOISE_LEGGINGS);
-			item.accept(ARMOR_TURQUOISE_BOOTS);
-			item.accept(QUICKIEPICKAXE);
-			item.accept(QUICKIEAXE);
-			item.accept(QUICKIESHOVEL);
-			item.accept(QUICKIESHEARS);
-			item.accept(QUICKIEHOE);
-			item.accept(QUICKIEWATERHOE);
-			item.accept(SPEEDPICKAXE);
-			item.accept(SPEEDAXE);
-			item.accept(SPEEDSHOVEL);
-			item.accept(SPEEDSHEARS);
-			item.accept(SPEEDHOE);
-			item.accept(SPEEDWATERHOE);
-		});
 	}
 }

src/main/java/de/jottyfan/minecraft/tab/QuicklyTab.java

@@ -1,31 +0,0 @@
-package de.jottyfan.minecraft.tab;
-
-import de.jottyfan.minecraft.Quickly;
-import de.jottyfan.minecraft.item.QuicklyItems;
-import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-
-/**
- *
- * @author jotty
- *
- */
-public class QuicklyTab {
-
-	public static final ResourceKey<CreativeModeTab> QUICKLY_TAB = ResourceKey.create(Registries.CREATIVE_MODE_TAB,
-			Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "itemgroup"));
-
-	public static final void registerItemGroup() {
-		Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, QUICKLY_TAB,
-				FabricItemGroup.builder().icon(() -> new ItemStack(QuicklyItems.QUICKIEPOWDER))
-						.title(Component.translatable("tab." + Quickly.MOD_ID)).build());
-	}
-
-}

src/main/resources/assets/quickly/models/block/canolaplant0.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/canolaplant0"
     }

src/main/resources/assets/quickly/models/block/canolaplant1.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/canolaplant1"
     }

src/main/resources/assets/quickly/models/block/canolaplant2.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/canolaplant2"
     }

src/main/resources/assets/quickly/models/block/canolaplant3.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/canolaplant3"
     }

src/main/resources/assets/quickly/models/block/canolaplant4.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/canolaplant4"
     }

src/main/resources/assets/quickly/models/block/canolaplant5.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/canolaplant5"
     }

src/main/resources/assets/quickly/models/block/canolaplant6.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/canolaplant6"
     }

src/main/resources/assets/quickly/models/block/canolaplant7.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/canolaplant7"
     }

src/main/resources/assets/quickly/models/block/cottonplant0.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/cottonplant0"
     }

src/main/resources/assets/quickly/models/block/cottonplant1.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/cottonplant1"
     }

src/main/resources/assets/quickly/models/block/cottonplant2.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/cottonplant2"
     }

src/main/resources/assets/quickly/models/block/cottonplant3.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/cottonplant3"
     }

src/main/resources/assets/quickly/models/block/cottonplant4.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/cottonplant4"
     }

src/main/resources/assets/quickly/models/block/cottonplant5.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/cottonplant5"
     }

src/main/resources/assets/quickly/models/block/cottonplant6.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/cottonplant6"
     }

src/main/resources/assets/quickly/models/block/cottonplant7.json

@@ -1,5 +1,6 @@
 {
     "parent":"block/cross",
+    "render_type": "minecraft:cutout",
     "textures":{
         "cross":"quickly:block/cottonplant7"
     }

src/main/resources/data/quickly/item_group/quickly.json

@@ -0,0 +1,71 @@
+{
+  "icon": {
+    "id": "quickly:quickiepowder"
+  },
+  "title": {
+    "translate": "tab.quickly"
+  },
+  "display-items": [
+    { "id": "quickly:stub" },
+		{ "id": "quickly:cotton" },
+		{ "id": "quickly:cottonseed" },
+		{ "id": "quickly:rottenfleshstripes" },
+		{ "id": "quickly:carrotstack" },
+		{ "id": "quickly:canola" },
+		{ "id": "quickly:canolaseed" },
+		{ "id": "quickly:canolabottle" },
+		{ "id": "quickly:canolabottlestack" },
+		{ "id": "quickly:rawturquoise" },
+		{ "id": "quickly:speedpowder" },
+		{ "id": "quickly:quickiepowder" },
+		{ "id": "quickly:turquoiseingot" },
+		{ "id": "quickly:speedingot" },
+		{ "id": "quickly:quickieingot" },
+		{ "id": "quickly:copperpowder" },
+		{ "id": "quickly:oxidizedcopperpowder" },
+		{ "id": "quickly:copperstring" },
+		{ "id": "quickly:copperstick" },
+		{ "id": "quickly:copperstub" },
+		{ "id": "quickly:salpeter" },
+		{ "id": "quickly:sulfor" },
+		{ "id": "quickly:magnifier" },
+		{ "id": "quickly:armor_turquoise_helmet" },
+		{ "id": "quickly:armor_turquoise_chestplate" },
+		{ "id": "quickly:armor_turquoise_leggings" },
+		{ "id": "quickly:armor_turquoise_boots" },
+		{ "id": "quickly:quickiepickaxe" },
+		{ "id": "quickly:quickieaxe" },
+		{ "id": "quickly:quickieshovel" },
+		{ "id": "quickly:quickieshears" },
+		{ "id": "quickly:quickiehoe" },
+		{ "id": "quickly:quickiewaterhoe" },
+		{ "id": "quickly:speedpickaxe" },
+		{ "id": "quickly:speedaxe" },
+		{ "id": "quickly:speedshovel" },
+		{ "id": "quickly:speedshears" },
+		{ "id": "quickly:speedhoe" },
+		{ "id": "quickly:speedwaterhoe" },
+		{ "id": "quickly:kelpbundle" },
+		{ "id": "quickly:turquoiseblock" },
+		{ "id": "quickly:dirtsalpeter" },
+		{ "id": "quickly:sandsalpeter" },
+		{ "id": "quickly:oresalpeter" },
+		{ "id": "quickly:oresulfor" },
+		{ "id": "quickly:oreturquoise" },
+		{ "id": "quickly:orespeedpowder" },
+		{ "id": "quickly:oresandsalpeter" },
+		{ "id": "quickly:oredeepslateturquoise" },
+		{ "id": "quickly:oredeepslatesulfor" },
+		{ "id": "quickly:oredeepslatespeedpowder" },
+		{ "id": "quickly:orenethersulfor" },
+		{ "id": "quickly:speedpowder" },
+		{ "id": "quickly:quickiepowder" },
+		{ "id": "quickly:monsterhoarder" },
+		{ "id": "quickly:itemhoarder" },
+		{ "id": "quickly:lavahoarder" },
+		{ "id": "quickly:drill" },
+		{ "id": "quickly:stacker" },
+		{ "id": "quickly:salpeterblock" },
+		{ "id": "quickly:sulforblock" }
+  ]
+}

src/main/resources/fabric.mod.json

@@ -26,7 +26,7 @@
 		"quickly.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.18.3",
+		"fabricloader": ">=0.18.4",
 		"minecraft": "~26.1-",
 		"java": ">=25",
 		"fabric-api": "*"