"Implement Shadow Inventory and Tag Support for Items"

CodeCraftPlugin · CodeCraftPlugin · commit 628fc86c80be · 2023-12-06T23:21:53.000+05:30
Extend functionality of ShadowStoneItem and add a custom inventory ShadowStoneInventory. Also, added DarkenDepthsItemTag file that provides tag support for darken depth items. For managing these changes, ShadowCoreItem is added and Armor changing function is removed from ShadowStoneItem, as now it supports custom inventory. The ShadowStoneInventory read and write NBT data, which is necessary to persist the inventory across sessions. Made additional changes in PlayerEntityMixin to support custom inventory opening and item saving. Version is updated to reflect these substantial changes.ing"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,10 +44,10 @@ jobs:
           modrinth-id: walrejrR
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
           modrinth-files: "build/libs/darkendepths-${{ steps.build.outputs.version }}.jar"
-          name: Darken Depths 1.20.2-1.0.0
+          name: "Darken Depths ${{ steps.build.outputs.version }}"
           version: ${{ steps.build.outputs.version }}
           version-type: beta
-          changelog: "${{steps.build.outputs.changelog}}"
+          changelog: ${{steps.build.outputs.changelog}}
           game-version: 1.20.2
           loaders: fabric
           dependencies:
diff --git a/build.gradle b/build.gradle
@@ -113,7 +113,12 @@ publishing {
         // The repositories here will be used for publishing your artifact, not for
         // retrieving dependencies.
     }
+
+
+}
+
+if (!System.properties['os.name'].toLowerCase().contains('windows')) {
     exec {
-        commandLine "echo", "##[set-output name=version;]${project.version}";
+        commandLine "echo", "##[set-output name=version;]${project.version}"
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
 
 
 # Mod Properties
-	mod_version = beta-1.20.2-1.1.0
+	mod_version = beta-1.20.2-1.2.0
 	maven_group = me.codecraft
 	archives_base_name = darkendepths
 	modid=darkendepths
diff --git a/src/main/generated/assets/darkendepths/lang/en_us.json b/src/main/generated/assets/darkendepths/lang/en_us.json
@@ -12,5 +12,6 @@
   "item.darkendepths.dark_pickaxe": "§5§lDarkened Pickaxe",
   "item.darkendepths.dark_shovel": "§5§lDarkened Shovel",
   "item.darkendepths.dark_sword": "§5§lDarkened Sword",
-  "item.darkendepths.shadow_stone": "Shadow Stone"
+  "item.darkendepths.shadow_stone": "Shadow Stone",
+  "screen.darkendepths.shadowstone_inventory": "Shadow's Inventory"
 }
diff --git a/src/main/java/me/codecraft/darkendepths/DarkenDepthsDataGenerator.java b/src/main/java/me/codecraft/darkendepths/DarkenDepthsDataGenerator.java
@@ -2,13 +2,15 @@
 
 import me.codecraft.darkendepths.datagen.*;
 import me.codecraft.darkendepths.datagen.loottables.DarkenDepthsBlockLootTablesGenerator;
-import me.codecraft.darkendepths.datagen.tags.DarkenDepthsBlockMiningLevelGenerator;
+import me.codecraft.darkendepths.datagen.tags.DarkenDepthsBlockTag;
+import me.codecraft.darkendepths.datagen.tags.DarkenDepthsItemTag;
 import me.codecraft.darkendepths.world.DarkenDepthsConfiguredFeatures;
 import me.codecraft.darkendepths.world.DarkenDepthsPlacedFeatures;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 import net.minecraft.registry.RegistryBuilder;
 import net.minecraft.registry.RegistryKeys;
+import net.minecraft.world.gen.feature.OrePlacedFeatures;
 import org.jetbrains.annotations.Nullable;
 
 public class DarkenDepthsDataGenerator implements DataGeneratorEntrypoint {
@@ -20,15 +22,16 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
         pack.addProvider(DarkenDepthsRecipesGenerator::new);
         pack.addProvider(DarkenDepthsAdvancementGenerator::new);
         pack.addProvider(DarkenDepthsBlockLootTablesGenerator::new);
-        pack.addProvider(DarkenDepthsBlockMiningLevelGenerator::new);
+        pack.addProvider(DarkenDepthsBlockTag::new);
+        pack.addProvider(DarkenDepthsItemTag::new);
         pack.addProvider(DarkenDepthsWorldGenerator::new);
 //        pack.addProvider(DarkenDepthsBiomesGenerator::new);
     }
     @Override
     public void buildRegistry(RegistryBuilder registryBuilder) {
         registryBuilder.addRegistry(RegistryKeys.CONFIGURED_FEATURE, DarkenDepthsConfiguredFeatures::bootstrap);
         registryBuilder.addRegistry(RegistryKeys.PLACED_FEATURE, DarkenDepthsPlacedFeatures::bootstrap);
-//        OrePlacedFeatures
+//        OrePlacedFeatures.
     }
 
     @Override
diff --git a/src/main/java/me/codecraft/darkendepths/datagen/DarkenDepthsLangGenerator.java b/src/main/java/me/codecraft/darkendepths/datagen/DarkenDepthsLangGenerator.java
@@ -3,6 +3,8 @@
 import me.codecraft.darkendepths.DarkenDepths;
 import me.codecraft.darkendepths.blocks.DarkenDepthsBlocks;
 import me.codecraft.darkendepths.item.DarkenDepthsItems;
+import me.codecraft.darkendepths.status_effects.DarkenDepthsStatusEffect;
+import me.codecraft.darkendepths.status_effects.DarkenDepthsStatusEffects;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider;
 
@@ -14,6 +16,7 @@ public DarkenDepthsLangGenerator(FabricDataOutput dataOutput) {
     @Override
     public void generateTranslations(TranslationBuilder translationBuilder) {
         translationBuilder.add(DarkenDepthsItems.SHADOW_STONE, "Shadow Stone");
+        translationBuilder.add(DarkenDepthsItems.DARKSHADOW_CORE, "DarkShadow's Core");
         translationBuilder.add(DarkenDepthsBlocks.DARKENED_STONE_ORE, "§5Darkened Stone Ore");
         translationBuilder.add(DarkenDepthsBlocks.DEEPSLATE_DARKENED_STONE_ORE, "§5Deepslate Darkened Stone Ore");
         translationBuilder.add(DarkenDepthsItems.DARK_ESSENCE, "§5§lDark Essence");
@@ -27,6 +30,8 @@ public void generateTranslations(TranslationBuilder translationBuilder) {
         translationBuilder.add(DarkenDepthsItems.DARK_LEGGINGS, "§5§lDarkened Leggings");
         translationBuilder.add(DarkenDepthsItems.DARK_BOOTS, "§5§lDarkened Boots");
         translationBuilder.add(DarkenDepths.MOD_ID+".advancement.get_darkness_armor", "Get Full Darkened Armor");
+        translationBuilder.add("screen.darkendepths.shadowstone_inventory","Shadow's Inventory");
+        translationBuilder.add(DarkenDepthsStatusEffects.SHADOW_PROTECTION,"Shadow's Protection");
     }
 }
 
diff --git a/src/main/java/me/codecraft/darkendepths/datagen/tags/DarkenDepthsBlockTag.java b/src/main/java/me/codecraft/darkendepths/datagen/tags/DarkenDepthsBlockTag.java
@@ -1,6 +1,5 @@
 package me.codecraft.darkendepths.datagen.tags;
 
-import me.codecraft.darkendepths.DarkenDepths;
 import me.codecraft.darkendepths.blocks.DarkenDepthsBlocks;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
@@ -12,12 +11,12 @@
 
 import java.util.concurrent.CompletableFuture;
 
-public class DarkenDepthsBlockMiningLevelGenerator extends FabricTagProvider.BlockTagProvider {
+public class DarkenDepthsBlockTag extends FabricTagProvider.BlockTagProvider {
 
     private static final TagKey<Block> MINEABLE_PICKAXE = TagKey.of(RegistryKey.ofRegistry(new Identifier("minecraft:mineable/pickaxe")), new Identifier("minecraft:mineable/pickaxe"));
     private static final TagKey<Block>  NEED_TOOL_LEVEL_3= TagKey.of(RegistryKey.ofRegistry(new Identifier("fabric:needs_tool_level_3")), new Identifier("fabric:needs_tool_level_3"));
 
-    public DarkenDepthsBlockMiningLevelGenerator(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
+    public DarkenDepthsBlockTag(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
         super(output, registriesFuture);
     }
 
diff --git a/src/main/java/me/codecraft/darkendepths/datagen/tags/DarkenDepthsItemTag.java b/src/main/java/me/codecraft/darkendepths/datagen/tags/DarkenDepthsItemTag.java
@@ -0,0 +1,29 @@
+package me.codecraft.darkendepths.datagen.tags;
+
+import me.codecraft.darkendepths.DarkenDepths;
+import me.codecraft.darkendepths.inventory.ShadowStoneInventory;
+import me.codecraft.darkendepths.item.DarkenDepthsItems;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+import java.util.concurrent.CompletableFuture;
+
+public class DarkenDepthsItemTag extends FabricTagProvider.ItemTagProvider  {
+
+    public static final TagKey<Item> SHADOW_PROTECTION = TagKey.of(RegistryKey.ofRegistry(new Identifier(DarkenDepths.MOD_ID,"shadows_protection")), new Identifier(DarkenDepths.MOD_ID,"shadows_protection"));
+    public DarkenDepthsItemTag(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> completableFuture) {
+        super(output, completableFuture);
+    }
+
+    @Override
+    protected void configure(RegistryWrapper.WrapperLookup arg) {
+        getOrCreateTagBuilder(SHADOW_PROTECTION).add(DarkenDepthsItems.DARK_PICKAXE,DarkenDepthsItems.DARK_AXE,DarkenDepthsItems.DARK_SWORD,DarkenDepthsItems.DARKSHADOW_CORE);
+
+    }
+}
diff --git a/src/main/java/me/codecraft/darkendepths/inventory/ShadowStoneInventory.java b/src/main/java/me/codecraft/darkendepths/inventory/ShadowStoneInventory.java
@@ -0,0 +1,40 @@
+package me.codecraft.darkendepths.inventory;
+
+import net.minecraft.inventory.SimpleInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtList;
+
+public class ShadowStoneInventory extends SimpleInventory {
+    public ShadowStoneInventory() {
+        super(36);
+    }
+
+    @Override
+    public void readNbtList(NbtList nbtList) {
+        int i;
+        for (i = 0; i < this.size(); ++i) {
+            this.setStack(i, ItemStack.EMPTY);
+        }
+        for (i = 0; i < nbtList.size(); ++i) {
+            NbtCompound nbtCompound = nbtList.getCompound(i);
+            int j = nbtCompound.getByte("Slot") & 0xFF;
+            if (j < 0 || j >= this.size()) continue;
+            this.setStack(j, ItemStack.fromNbt(nbtCompound));
+        }
+    }
+
+    @Override
+    public NbtList toNbtList() {
+        NbtList nbtList = new NbtList();
+        for (int i = 0; i < this.size(); ++i) {
+            ItemStack itemStack = this.getStack(i);
+            if (itemStack.isEmpty()) continue;
+            NbtCompound nbtCompound = new NbtCompound();
+            nbtCompound.putByte("Slot", (byte)i);
+            itemStack.writeNbt(nbtCompound);
+            nbtList.add(nbtCompound);
+        }
+        return nbtList;
+    }
+}
diff --git a/src/main/java/me/codecraft/darkendepths/item/DarkenDepthsItems.java b/src/main/java/me/codecraft/darkendepths/item/DarkenDepthsItems.java
@@ -8,6 +8,7 @@
 
 public class DarkenDepthsItems {
     public static final Item DARK_ESSENCE  = Registry.registerItems("dark_essence", DarkenDepths.MOD_ID,new Item(new FabricItemSettings()), DarkenDepthsGroupItems.DARKEN_DEPTHS_GROUP);
+    public static final Item DARKSHADOW_CORE  = Registry.registerItems("darkshadow_core", DarkenDepths.MOD_ID,new Item(new FabricItemSettings()), DarkenDepthsGroupItems.DARKEN_DEPTHS_GROUP);
     public static final Item SHADOW_STONE  = Registry.registerItems("shadow_stone", DarkenDepths.MOD_ID,new ShadowStoneItem(new FabricItemSettings()), DarkenDepthsGroupItems.DARKEN_DEPTHS_GROUP);
     public static final Item DARK_SWORD  = Registry.registerItems("dark_sword", DarkenDepths.MOD_ID,new SwordItem(DarkenDepthsToolMaterials.DARKNESS,10,5.0f,new FabricItemSettings()), DarkenDepthsGroupItems.DARKEN_DEPTHS_GROUP);
     public static final Item DARK_AXE  = Registry.registerItems("dark_axe", DarkenDepths.MOD_ID,new AxeItem(DarkenDepthsToolMaterials.DARKNESS,10,5.0f,new FabricItemSettings()), DarkenDepthsGroupItems.DARKEN_DEPTHS_GROUP);
diff --git a/src/main/java/me/codecraft/darkendepths/item/custom/ShadowStoneItem.java b/src/main/java/me/codecraft/darkendepths/item/custom/ShadowStoneItem.java
@@ -1,36 +1,53 @@
 package me.codecraft.darkendepths.item.custom;
 
-import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
-import net.minecraft.entity.EquipmentSlot;
+import me.codecraft.darkendepths.inventory.ShadowStoneInventory;
+import me.codecraft.darkendepths.mixinInterface.IPlayerInventroyMixin;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.Inventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.screen.GenericContainerScreenHandler;
+import net.minecraft.screen.NamedScreenHandlerFactory;
+import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.world.World;
 
+
 public class ShadowStoneItem extends Item {
+
     public ShadowStoneItem(Settings settings) {
         super(settings);
     }
+    public static GenericContainerScreenHandler createGeneric9x4(int syncId, PlayerInventory playerInventory, Inventory inventory) {
+        return new GenericContainerScreenHandler(ScreenHandlerType.GENERIC_9X4, syncId, playerInventory, inventory, 4);
+    }
+
+
+    MutableText Text1 = Text.translatable("screen.darkendepths.shadowstone_inventory");
 
     @Override
     public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand hand) {
 
-        if(!world.isClient){
-            if (user!=null&&!user.getInventory().armor.isEmpty()) {
-                System.out.println(user.getInventory().getArmorStack(0));
-                ItemStack boots = user.getInventory().getArmorStack(0).copy();
-                ItemStack leggings = user.getInventory().getArmorStack(0).copy();
-                ItemStack chestplate = user.getInventory().getArmorStack(0).copy();
-                ItemStack helemt = user.getInventory().getArmorStack(0).copy();
-                user.getInventory().armor.remove(2);
-                user.getInventory().armor.remove(3);
-                user.getInventory().armor.remove(4);
-                user.getInventory().armor.remove(0);
-            }
+        if(!world.isClient&&user instanceof ServerPlayerEntity){
+            ShadowStoneInventory shadowStoneInventory;
+            shadowStoneInventory = ((IPlayerInventroyMixin)user).getShadowStoneInventory();
+            user.sendMessage(Text.literal("Supp mate"));
+            NamedScreenHandlerFactory screenHandlerFactory = new SimpleNamedScreenHandlerFactory((syncId, playerInventory, playerEntity) -> createGeneric9x4(syncId,playerInventory,shadowStoneInventory),Text1);
+            // Send a packet to the client to open the GUI
+            ServerPlayerEntity serverPlayerEntity = (ServerPlayerEntity) user;
+            serverPlayerEntity.openHandledScreen(screenHandlerFactory);
+
         }
+
         return super.use(world, user, hand);
     }
+
+
+
 }
diff --git a/src/main/java/me/codecraft/darkendepths/mixin/PlayerEntityMixin.java b/src/main/java/me/codecraft/darkendepths/mixin/PlayerEntityMixin.java
@@ -1,46 +1,85 @@
 package me.codecraft.darkendepths.mixin;
 
 
+import me.codecraft.darkendepths.datagen.tags.DarkenDepthsItemTag;
+import me.codecraft.darkendepths.inventory.ShadowStoneInventory;
 import me.codecraft.darkendepths.item.DarkenDepthsItems;
+import me.codecraft.darkendepths.mixinInterface.IPlayerInventroyMixin;
 import me.codecraft.darkendepths.status_effects.DarkenDepthsStatusEffects;
+import net.fabricmc.fabric.mixin.item.ItemStackMixin;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.*;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtElement;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Hand;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
 @Mixin(PlayerEntity.class)
-public abstract class PlayerEntityMixin extends LivingEntity {
+public abstract class PlayerEntityMixin extends LivingEntity implements IPlayerInventroyMixin {
+
 
+    ShadowStoneInventory shadowStoneInventory = new ShadowStoneInventory();
 
     protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World world) {
         super(entityType, world);
     }
 
+    @Override
+    public ShadowStoneInventory getShadowStoneInventory() {
+        return shadowStoneInventory;
+    }
+    //Injecting
+
     @Inject(at = @At("HEAD"), method = "tick")
     private void tick(CallbackInfo info) {
         PlayerEntity player = (PlayerEntity)(Object) this;
         CheckArmor(player);
 
     }
+
+    @Inject(at= @At("TAIL"),method = "readCustomDataFromNbt")
+    public void readNbt(NbtCompound nbt, CallbackInfo ci){
+        if (nbt.contains("ShadowItems", NbtElement.LIST_TYPE)) {
+            shadowStoneInventory.readNbtList(nbt.getList("ShadowItems", NbtElement.COMPOUND_TYPE));
+        }
+
+    }
+    @Inject(at= @At("TAIL"),method = "writeCustomDataToNbt")
+    private void writeNbt(NbtCompound nbt, CallbackInfo ci){
+        nbt.put("ShadowItems", shadowStoneInventory.toNbtList());
+
+    }
+    //Modifying Variable
     @ModifyVariable(method = "damage", at = @At("HEAD"), argsOnly = true)
     private float modifyDamage(float amount, DamageSource source) {
         PlayerEntity player = (PlayerEntity)(Object) this;
-        if (player.hasStatusEffect(DarkenDepthsStatusEffects.SHADOW_PROTECTION) && !player.getWorld().isDay()) {
+        ItemStack attackerItem  = player.getAttacker().getStackInHand(Hand.MAIN_HAND).getItem().getDefaultStack();
+        List<Item> yourItemList = Arrays.asList(DarkenDepthsItems.DARK_PICKAXE,DarkenDepthsItems.DARK_AXE,DarkenDepthsItems.DARK_SWORD,DarkenDepthsItems.DARKSHADOW_CORE);
+        if (player.hasStatusEffect(DarkenDepthsStatusEffects.SHADOW_PROTECTION) && !(player.getWorld().isDay() )&& (player.getHealth()<1)&& !(yourItemList.contains(attackerItem))) {
+
             return 0.0F;
         }
         return amount;
     }
+
     private void CheckArmor(PlayerEntity player){
-        System.out.println(player.getArmorItems().iterator().next().getItem());
+//        System.out.println(player.getArmorItems().iterator().next().getItem());
 
         if(player.getEquippedStack(EquipmentSlot.HEAD).getItem() != DarkenDepthsItems.DARK_HELMET){
             resetArmorEffect(player);
diff --git a/src/main/java/me/codecraft/darkendepths/mixinInterface/IPlayerInventroyMixin.java b/src/main/java/me/codecraft/darkendepths/mixinInterface/IPlayerInventroyMixin.java
@@ -0,0 +1,8 @@
+package me.codecraft.darkendepths.mixinInterface;
+
+import me.codecraft.darkendepths.inventory.ShadowStoneInventory;
+
+public interface IPlayerInventroyMixin {
+    ShadowStoneInventory getShadowStoneInventory();
+
+}
diff --git a/src/main/resources/assets/darkendepths/textures/item/shadow_stone.png b/src/main/resources/assets/darkendepths/textures/item/shadow_stone.png

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,12 @@ publishing {`
`113`	`113`	`// The repositories here will be used for publishing your artifact, not for`
`114`	`114`	`// retrieving dependencies.`
`115`	`115`	`}`
	`116`	`+`
	`117`	`+`
	`118`	`+}`
	`119`	`+`
	`120`	`+if (!System.properties['os.name'].toLowerCase().contains('windows')) {`
`116`	`121`	`exec {`
`117`		`- commandLine "echo", "##[set-output name=version;]${project.version}";`
	`122`	`+ commandLine "echo", "##[set-output name=version;]${project.version}"`
`118`	`123`	`}`
`119`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@`
`12`	`12`	`"item.darkendepths.dark_pickaxe": "§5§lDarkened Pickaxe",`
`13`	`13`	`"item.darkendepths.dark_shovel": "§5§lDarkened Shovel",`
`14`	`14`	`"item.darkendepths.dark_sword": "§5§lDarkened Sword",`
`15`		`- "item.darkendepths.shadow_stone": "Shadow Stone"`
	`15`	`+ "item.darkendepths.shadow_stone": "Shadow Stone",`
	`16`	`+ "screen.darkendepths.shadowstone_inventory": "Shadow's Inventory"`
`16`	`17`	`}`