TechReborn#2775 Adding trinket support for BatpackItem

* Added support for wearing BatpackItems in the 'back' trinket slot on the chest. This frees up an additional space for regular armor.

RebornCore/src/main/java/reborncore/common/util/ItemUtils.java

@@ -28,6 +28,7 @@
 import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant;
 import net.fabricmc.fabric.api.transfer.v1.item.PlayerInventoryStorage;
 import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage;
+import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -286,12 +287,43 @@ public static void distributePowerToInventory(PlayerEntity player, ItemStack ite
 				continue;
 			}
 
+			EnergyStorage receiverStorage = ContainerItemContext.ofPlayerSlot(player, playerInv.getSlots().get(i)).find(EnergyStorage.ITEM);
+
 			EnergyStorageUtil.move(
 					sourceStorage,
-					ContainerItemContext.ofPlayerSlot(player, playerInv.getSlots().get(i)).find(EnergyStorage.ITEM),
+					receiverStorage,
 					maxOutput,
 					null
 			);
 		}
 	}
+
+	public static void distributePowerToInventoryFromItem(PlayerEntity player, ItemStack source, long maxOutput) {
+		PlayerInventoryStorage playerInv = PlayerInventoryStorage.of(player);
+
+		EnergyStorage sourceStorage = EnergyStorage.ITEM.find(source, ContainerItemContext.withInitial(source));
+
+		for (int i = 0; i < player.getInventory().size(); i++) {
+			ItemStack invStack = player.getInventory().getStack(i);
+
+			if (invStack.isEmpty()) {
+				continue;
+			}
+
+			EnergyStorage receiverStorage = ContainerItemContext.ofPlayerSlot(player, playerInv.getSlots().get(i)).find(EnergyStorage.ITEM);
+
+			if (receiverStorage == null) {
+				continue;
+			}
+
+			try (Transaction outerTransaction = Transaction.openOuter()) {
+				long acceptedEnergy = receiverStorage.insert(maxOutput, outerTransaction);
+				try (Transaction nestedTransaction = outerTransaction.openNested()) {
+					sourceStorage.extract(acceptedEnergy, nestedTransaction);
+					nestedTransaction.commit();
+				}
+				outerTransaction.commit();
+			}
+		}
+	}
 }

build.gradle

@@ -45,6 +45,16 @@ repositories {
         content {
             // Trinkets dependency
             includeGroup "io.github.onyxstudios.Cardinal-Components-API"
+            includeGroup "dev.onyxstudios.cardinal-components-api"
+        }
+    }
+    // Needed because of an error in the POM file in the Trinkets implementation
+    // See https://github.com/emilyploszaj/trinkets/issues/159
+    maven {
+        name = "TerraformersMC"
+        url = "https://maven.terraformersmc.com/"
+        content {
+            includeGroup("com.terraformersmc")
         }
     }
 	maven {
@@ -184,7 +194,7 @@ dependencies {
     include project(":RebornCore")
 
     optionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
-    disabledOptionalDependency "com.github.emilyploszaj:trinkets:${project.trinkets_version}"
+    optionalDependency "com.github.emilyploszaj:trinkets:${project.trinkets_version}"
     disabledOptionalDependency "net.oskarstrom:DashLoader:${project.dashloader_version}"
 
     // Use groovy for datagen/gametest, if you are copying this you prob dont want it.
@@ -304,8 +314,10 @@ task renameCrowdin(type: Copy, dependsOn: ['crowdin', 'cleanCrowdin']){
 	}
 }
 
-import groovy.json.JsonSlurper
+
 import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
+import groovy.util.XmlSlurper
 
 task fixTranslations(dependsOn: ['renameCrowdin']) {
     description "Remove all translations that do not have an entry, ensures that minecraft falls back to EN_US over writing out an empty string"
@@ -321,7 +333,8 @@ task fixTranslations(dependsOn: ['renameCrowdin']) {
 	}
 }
 
-import groovy.util.XmlSlurper
+
+import org.kohsuke.github.GHReleaseBuilder
 
 curseforge {
 	if (ENV.CURSEFORGE_API_KEY) {
@@ -360,7 +373,7 @@ def getBranch() {
 	return "unknown"
 }
 
-import org.kohsuke.github.GHReleaseBuilder
+
 import org.kohsuke.github.GitHub
 
 task github(dependsOn: remapJar) {

gradle.properties

@@ -14,5 +14,5 @@ org.gradle.jvmargs=-Xmx2G
 # Dependencies
     energy_version=2.2.0
     rei_version=8.0.438
-    trinkets_version=3.0.2
+    trinkets_version=3.3.0
     dashloader_version=2.0

src/main/java/techreborn/items/armor/BatpackItem.java

@@ -24,8 +24,12 @@
 
 package techreborn.items.armor;
 
+import dev.emi.trinkets.api.SlotReference;
+import dev.emi.trinkets.api.Trinket;
+import dev.emi.trinkets.api.TrinketsApi;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.ArmorMaterial;
@@ -39,7 +43,7 @@
 import techreborn.TechReborn;
 import techreborn.utils.InitUtils;
 
-public class BatpackItem extends ArmorItem implements RcEnergyItem {
+public class BatpackItem extends ArmorItem implements RcEnergyItem, Trinket {
 
 	public final int maxCharge;
 	public final RcEnergyTier tier;
@@ -48,6 +52,15 @@ public BatpackItem(int maxCharge, ArmorMaterial material, RcEnergyTier tier) {
 		super(material, EquipmentSlot.CHEST, new Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
 		this.maxCharge = maxCharge;
 		this.tier = tier;
+		TrinketsApi.registerTrinket(this, this);
+	}
+
+	//Trinket
+	@Override
+	public void tick(ItemStack stack, SlotReference slot, LivingEntity entity) {
+		if (entity instanceof PlayerEntity) {
+			ItemUtils.distributePowerToInventoryFromItem((PlayerEntity) entity, stack, tier.getMaxOutput());
+		}
 	}
 
 	// Item

src/main/resources/data/trinkets/entities/techreborn.json

@@ -0,0 +1,8 @@
+{
+	"entities": [
+		"player"
+	],
+	"slots": [
+		"chest/back"
+	]
+}

src/main/resources/data/trinkets/tags/items/chest/back.json

@@ -0,0 +1,7 @@
+{
+	"replace": false,
+	"values": [
+		"techreborn:lithium_ion_batpack",
+		"techreborn:lapotronic_orbpack"
+	]
+}