1.21.5 support

Author: modmuss50

README.md

@@ -21,6 +21,7 @@ Find the latest versions [here](https://maven.fabricmc.net/teamreborn/energy/)
 - Version 3.x should be used for Minecraft 1.19.4 -> 1.20.4
 - Version 4.0.x should be used for Minecraft 1.20.5 or later
 - Version 4.1.x should be used for Minecraft 1.21 or later
+- Version 4.2.x should be used for Minecraft 1.21.5 or later
 
 Add the following into your dependencies block in build.gradle
 

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'java'
 	id 'maven-publish'
 }
@@ -61,28 +61,28 @@ java {
 publishing {
 	publications {
 		create("maven", MavenPublication) {
-			groupId 'teamreborn'
-			artifactId project.base.archivesName.get()
-			version project.version
+			groupId = 'teamreborn'
+			artifactId = project.base.archivesName.get()
+			version = project.version
 
 			from components.java
 		}
 	}
 	repositories {
 		if (ENV.MAVEN_URL) {
 			maven {
-				url ENV.MAVEN_URL
+				url = ENV.MAVEN_URL
 				credentials {
-					username ENV.MAVEN_USERNAME
-					password ENV.MAVEN_PASSWORD
+					username = ENV.MAVEN_USERNAME
+					password = ENV.MAVEN_PASSWORD
 				}
 			}
 		}
 	}
 }
 
 // A task to ensure that the version being released has not already been released.
-task checkVersion {
+tasks.register('checkVersion') {
 	doFirst {
 		def xml = new URL("https://maven.fabricmc.net/teamreborn/energy/maven-metadata.xml").text
 		def metadata = new XmlSlurper().parseText(xml)

gradle.properties

@@ -1,13 +1,13 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 
-mod_version=4.1.0
+mod_version=4.2.0
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.21-pre2
-yarn_mappings=1.21-pre2+build.2
-loader_version=0.15.11
+minecraft_version=1.21.5-pre2
+yarn_mappings=1.21.5-pre2+build.6
+loader_version=0.16.10
 
 # Dependencies
-fabric_version=0.99.4+1.21
+fabric_version=0.119.0+1.21.5

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -19,7 +19,7 @@ public abstract class SimpleSidedEnergyContainer extends SnapshotParticipant<Lon
 
 	public SimpleSidedEnergyContainer() {
 		for (int i = 0; i < 7; ++i) {
-			sideStorages[i] = new SideStorage(i == 6 ? null : Direction.byId(i));
+			sideStorages[i] = new SideStorage(i == 6 ? null : Direction.byIndex(i));
 		}
 	}
 
@@ -42,7 +42,7 @@ public SimpleSidedEnergyContainer() {
 	 * @return An {@link EnergyStorage} implementation for the passed side.
 	 */
 	public EnergyStorage getSideStorage(@Nullable Direction side) {
-		return sideStorages[side == null ? 6 : side.getId()];
+		return sideStorages[side == null ? 6 : side.getIndex()];
 	}
 
 	@Override

src/main/java/team/reborn/energy/api/base/SimpleSidedEnergyContainer.java

@@ -23,7 +23,7 @@
   },
   "depends": {
     "java": ">=21",
-    "minecraft": ">=1.21-",
+    "minecraft": ">=1.21.5-",
     "fabric-transfer-api-v1": ">=5.1.0"
   }
 }

src/main/resources/fabric.mod.json

@@ -2,13 +2,16 @@
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.util.Identifier;
 import team.reborn.energy.api.base.SimpleEnergyItem;
 
 public class TestBatteryItem extends Item implements SimpleEnergyItem {
 	private final long capacity, maxInput, maxOutput;
 
 	public TestBatteryItem(long capacity, long maxInput, long maxOutput) {
-		super(new Item.Settings());
+		super(new Item.Settings().registryKey(RegistryKey.of(RegistryKeys.ITEM, Identifier.of("energy_test", "battery"))));
 		this.capacity = capacity;
 		this.maxInput = maxInput;
 		this.maxOutput = maxOutput;