Merge pull request #331 from terrarium-earth/fix/barrel

Fix barrel issue

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     java
     id("maven-publish")
     id("com.teamresourceful.resourcefulgradle") version "0.0.+"
-    id("dev.architectury.loom") version "1.6-SNAPSHOT" apply false
+    id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false
     id("architectury-plugin") version "3.4-SNAPSHOT"
     id("com.github.johnrengelman.shadow") version "7.1.2" apply false
 }
@@ -55,13 +55,13 @@ subprojects {
 
             officialMojangMappings()
 
-            parchment(create(group = "org.parchmentmc.data", name = "parchment-$minecraftVersion", version = parchmentVersion))
+            parchment(create(group = "org.parchmentmc.data", name = "parchment-1.21", version = parchmentVersion))
         })
 
-        "modApi"(group = "com.teamresourceful.resourcefullib", name = "resourcefullib-$modLoader-$minecraftVersion", version = resourcefulLibVersion)
-        "modApi"(group = "earth.terrarium.athena", name = "athena-$modLoader-$minecraftVersion", version = athenaVersion)
+        "modApi"(group = "com.teamresourceful.resourcefullib", name = "resourcefullib-$modLoader-1.21", version = resourcefulLibVersion)
+        "modApi"(group = "earth.terrarium.athena", name = "athena-$modLoader-1.21", version = athenaVersion)
         if (isCommon) {
-            "modApi"(group = "mezz.jei", name = "jei-1.20.6-common-api", version = jeiVersion)
+            "modApi"(group = "mezz.jei", name = "jei-$minecraftVersion-common-api", version = jeiVersion)
             "modCompileOnly"(group = "me.shedaniel", name = "RoughlyEnoughItems-api", version = reiVersion)
             "modCompileOnly"(group = "me.shedaniel", name = "RoughlyEnoughItems-default-plugin", version = reiVersion)
         } else {

common/src/main/java/earth/terrarium/chipped/Chipped.java

@@ -2,6 +2,7 @@
 
 import earth.terrarium.chipped.common.network.NetworkHandler;
 import earth.terrarium.chipped.common.registry.*;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 
 public class Chipped {
     public static final String MOD_ID = "chipped";

fabric/gradle.properties

@@ -1,2 +1,2 @@
-fabricLoaderVersion=0.15.11
-fabricApiVersion=0.100.1
+fabricLoaderVersion=0.16.3
+fabricApiVersion=0.103.0

fabric/src/main/java/earth/terrarium/chipped/fabric/ChippedFabric.java

@@ -1,11 +1,16 @@
 package earth.terrarium.chipped.fabric;
 
+import com.teamresourceful.resourcefullib.common.registry.RegistryEntry;
 import earth.terrarium.chipped.Chipped;
+import earth.terrarium.chipped.common.registry.ModBlocks;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityType;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 
 public class ChippedFabric implements ModInitializer {
     @Override
     public void onInitialize() {
         Chipped.init();
+        ModBlocks.BARREL.stream().map(RegistryEntry::get).forEach(((FabricBlockEntityType) BlockEntityType.BARREL)::addSupportedBlock);
     }
 }

gradle.properties

@@ -2,15 +2,15 @@ org.gradle.jvmargs=-Xmx2G
 
 enabledPlatforms=fabric,neoforge
 
-version=4.0.0
+version=4.0.1
 group=earth.terrarium.chipped
 
-minecraftVersion=1.21
-parchmentVersion=2024.06.23
+minecraftVersion=1.21.1
+parchmentVersion=2024.07.28
 
-modMenuVersion=11.0.0-beta.2
-reiVersion=15.0.728
-jeiVersion=18.0.0.62
+modMenuVersion=11.0.2
+reiVersion=16.0.754
+jeiVersion=19.14.2.147
 
-resourcefulLibVersion=3.0.0
-athenaVersion=4.0.0
+resourcefulLibVersion=3.0.9
+athenaVersion=4.0.1

neoforge/gradle.properties

@@ -1,2 +1,2 @@
 loom.platform=neoforge
-neoforgeVersion=21.0.60-beta
+neoforgeVersion=21.1.34

neoforge/src/main/java/earth/terrarium/chipped/neoforge/ChippedNeoForge.java

@@ -1,11 +1,21 @@
 package earth.terrarium.chipped.neoforge;
 
+import com.teamresourceful.resourcefullib.common.registry.RegistryEntry;
 import earth.terrarium.chipped.Chipped;
+import earth.terrarium.chipped.common.registry.ModBlocks;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.IModBusEvent;
+import net.neoforged.neoforge.event.BlockEntityTypeAddBlocksEvent;
 
 @Mod(Chipped.MOD_ID)
 public class ChippedNeoForge {
-    public ChippedNeoForge() {
+    public ChippedNeoForge(IEventBus bus) {
         Chipped.init();
+
+        bus.addListener((BlockEntityTypeAddBlocksEvent event) -> {
+            ModBlocks.BARREL.stream().map(RegistryEntry::get).forEach(block -> event.modify(BlockEntityType.BARREL, block));
+        });
     }
 }