Merge remote-tracking branch 'origin/main'

Author: limingzxc

gradle.properties

@@ -21,7 +21,7 @@ neomoddev_version=1.0.20
 mod_id=ifw
 mod_name=Infinity Way
 mod_license=MIT
-mod_version=0.0-d
+mod_version=0.0-f
 mod_group_id=huix.infinity
 mod_authors=huix, limingzxc, xy_lose, YF_101
 mod_description=Minecraft is too easy Remastered Version

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.21.1	2025-01-31T16:27:56.4315567	Recipes
+// 1.21.1	2025-02-02T18:16:58.8508873	Recipes
 8095e32c2e0106f3ba40a10c204f6043d8dabfeb data/ifw/advancement/recipes/building_blocks/adamantium_bars.json
 9d5e5fb6ff22512e12565ce8c70ec8434a2d5448 data/ifw/advancement/recipes/building_blocks/adamantium_door.json
 c3ed1abdd1c9e856def620a4c7679b2fbc4b8e83 data/ifw/advancement/recipes/building_blocks/ancient_metal_bars.json
@@ -366,7 +366,7 @@ cca5022f1a16210e8c643bd9dfbc8573354b42d6 data/ifw/recipe/silver_shears.json
 18d5231ee8d0b7af5899008f6e32d851d38d119f data/ifw/recipe/silver_shovel.json
 ea4cb4518d2d36e26ebb3b306df7803635553105 data/ifw/recipe/silver_sword.json
 c6547a67b1dc8f968a49ae0fcd709a448ac3a199 data/ifw/recipe/silver_war_hammer.json
-c00077ccb0a010a14eaabe4bfcf3fd4744b2fcf3 data/ifw/recipe/sinew.json
+7ba0fda18fa3ffa0ba91c7de0487fb4aada129ea data/ifw/recipe/sinew.json
 132aa576722691b4a8bd63f75d8f410436c14c44 data/ifw/recipe/sorbet.json
 806daab1b386cb67af0732a470ef527b8d61b0c5 data/ifw/recipe/stone_furnace.json
 1016bfd66eebeaef180b44303130c1be878a2a2f data/ifw/recipe/vegetable_soup.json
@@ -384,6 +384,7 @@ a9b8907bfd52945202a8d3f6852ce350bf5f7d7e data/minecraft/advancement/recipes/buil
 6e523eee1ea699f772907f902f16f4f7cb3e4362 data/minecraft/advancement/recipes/building_blocks/mithril_block_from_ingot.json
 51603388ac82e19164c89315304f203f68e8dfb5 data/minecraft/advancement/recipes/building_blocks/nether_bricks.json
 4cb8ccef0ee5434856163cacc8ef7f8ff1888ea0 data/minecraft/advancement/recipes/building_blocks/obsidian.json
+7c7417e8dfdb46c3f5978a8b85a0ac503c1ba958 data/minecraft/advancement/recipes/building_blocks/pumpkin_seeds.json
 c810440c84781edd602de771fdfe5e023fe9904b data/minecraft/advancement/recipes/building_blocks/saddle.json
 f712991b7ae1c41a6294325b4874595d0cc90aec data/minecraft/advancement/recipes/building_blocks/silver_block_from_ingot.json
 454c0618a4ab72b2cf547e67b2a5496268a798e6 data/minecraft/advancement/recipes/building_blocks/smooth_basalt.json
@@ -524,6 +525,7 @@ ce85de452d95391cf4e86ae2b0b4af09a02938bf data/minecraft/recipe/obsidian.json
 9bbe6976bfb7418f9730f5c2b9f594f972ddaa62 data/minecraft/recipe/pink_glazed_terracotta.json
 0f1a9c606e681079272c71bbcb163a57ed1bea82 data/minecraft/recipe/popped_chorus_fruit.json
 6a55553eacd395fccaaf4637e9d2f305f3ac5a78 data/minecraft/recipe/pumpkin_pie.json
+943b84918dd5d69e10a77d6c370b2bc84e98064f data/minecraft/recipe/pumpkin_seeds.json
 41295b55747a473712d00d8aa7ac18e1eafeb965 data/minecraft/recipe/purple_glazed_terracotta.json
 a840a03d1b3631ad522b7ff315ed00b8ee0d4226 data/minecraft/recipe/quartz.json
 89377842d98832bdda3c10876c38019c8d8f2425 data/minecraft/recipe/raw_adamantium_smelting.json

src/generated/resources/.cache/c80c7a8ccd90f729100f93f300ddc4b41c2f09db

@@ -1,4 +1,4 @@
-// 1.21.1	2025-02-01T19:49:51.7669731	Tags for minecraft:block mod id ifw
+// 1.21.1	2025-02-02T18:20:35.6842981	Tags for minecraft:block mod id ifw
 135c338d4e90db4d3d07e2f281bb46d37795d1d3 data/minecraft/tags/block/anvil.json
 acf4e3ca7c3b0e94b6ea6bbf061ea843d1250c97 data/minecraft/tags/block/doors.json
 b147fcff5c0b4d72df1cb7809b063b2562180832 data/minecraft/tags/block/harvest_level_0_tool.json
@@ -13,4 +13,5 @@ ccb9467ef80c45c0c5c56759a5a78b3177be8d19 data/minecraft/tags/block/incorrect_for
 eabbbe1f65f580f77513deceab7ccbd9afc1aed7 data/minecraft/tags/block/incorrect_for_level_3_tool.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/minecraft/tags/block/incorrect_for_level_4_tool.json
 431a024b6cd1c8210fd861dbe3b73bf72d744e29 data/minecraft/tags/block/mineable/pickaxe.json
+856f3ec346a8e680ef42769e7466c83a465ec43c data/minecraft/tags/block/mineable/shovel.json
 a6266b90aa3c43c4e5fff8e080ba2ee2fe7b1280 data/minecraft/tags/block/portable_block.json

src/generated/resources/data/ifw/recipe/sinew.json

@@ -7,7 +7,7 @@
     }
   ],
   "result": {
-    "count": 2,
+    "count": 4,
     "id": "ifw:sinew"
   }
 }

src/generated/resources/data/minecraft/advancement/recipes/building_blocks/pumpkin_seeds.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_pumpkin": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:pumpkin"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minecraft:pumpkin_seeds"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_pumpkin"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:pumpkin_seeds"
+    ]
+  }
+}

src/generated/resources/data/minecraft/recipe/pumpkin_seeds.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "category": "building",
+  "ingredients": [
+    {
+      "item": "minecraft:pumpkin"
+    }
+  ],
+  "result": {
+    "count": 1,
+    "id": "minecraft:pumpkin_seeds"
+  }
+}

src/generated/resources/data/minecraft/tags/block/mineable/shovel.json

@@ -0,0 +1,23 @@
+{
+  "values": [
+    "minecraft:clay",
+    "minecraft:dirt",
+    "minecraft:coarse_dirt",
+    "minecraft:podzol",
+    "minecraft:farmland",
+    "minecraft:grass_block",
+    "minecraft:gravel",
+    "minecraft:mycelium",
+    "minecraft:sand",
+    "minecraft:red_sand",
+    "minecraft:soul_sand",
+    "minecraft:dirt_path",
+    "minecraft:soul_soil",
+    "minecraft:rooted_dirt",
+    "minecraft:muddy_mangrove_roots",
+    "minecraft:mud",
+    "minecraft:suspicious_sand",
+    "minecraft:suspicious_gravel",
+    "#minecraft:concrete_powder"
+  ]
+}

src/main/java/huix/infinity/attachment/IFWAttachment.java

@@ -42,4 +42,8 @@ public class IFWAttachment {
             "is_panic", () -> AttachmentType.builder(() -> false).serialize(Codec.BOOL).build()
     );
 
+    public static final Supplier<AttachmentType<Integer>> anvil_damage = ATTACHMENT_TYPES.register(
+            "anvil_damage", () -> AttachmentType.builder(() -> 0).serialize(Codec.INT).build()
+    );
+
 }

src/main/java/huix/infinity/common/world/block/IFWAnvilBlock.java

@@ -1,8 +1,7 @@
 package huix.infinity.common.world.block;
 
+import huix.infinity.attachment.IFWAttachment;
 import huix.infinity.common.world.block.entity.AnvilBlockEntity;
-import huix.infinity.common.world.block.entity.IFWFurnaceBlockEntity;
-import huix.infinity.common.world.inventory.IFWAnvilMenu;
 import huix.infinity.common.world.inventory.IFWCopperAnvilMenu;
 import huix.infinity.common.world.item.tier.IFWTiers;
 import huix.infinity.util.DurabilityHelper;
@@ -17,10 +16,11 @@
 import net.minecraft.world.entity.item.FallingBlockEntity;
 import net.minecraft.world.inventory.ContainerLevelAccess;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.alchemy.PotionContents;
+import net.minecraft.world.item.alchemy.Potions;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.AnvilBlock;
 import net.minecraft.world.level.block.EntityBlock;
-import net.minecraft.world.level.block.FallingBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 
@@ -44,12 +44,12 @@ public IFWAnvilBlock(Properties properties, IFWTiers tier, int stage) {
     @Override
     protected void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean isMoving) {
         if (canPlace(state, level, pos, oldState)) {
-            ServerLevel worldIn = (ServerLevel) level;
-            int durability = ((AnvilBlockEntity)worldIn.getBlockEntity(pos)).durability();
-            if (durability < this.maxDurability()) {
+            AnvilBlockEntity blockEntity = (AnvilBlockEntity) level.getBlockEntity(pos);
+            int damage = blockEntity.getData(IFWAttachment.anvil_damage.get());
+            if (damage < this.maxDurability()) {
                 ItemStack result = new ItemStack(this.asItem());
-                result.set(DataComponents.DAMAGE, durability);
-                popResource(worldIn, pos, result);
+                result.set(DataComponents.DAMAGE, damage);
+                popResource(level, pos, result);
             }
         }
         super.onPlace(state, level, pos, oldState, isMoving);
@@ -60,14 +60,19 @@ private boolean canPlace(BlockState state, Level level, BlockPos pos, BlockState
                 && !(state.getBlock() instanceof AnvilBlock);
     }
 
+    @Override
+    public ItemStack ifw_defaultInstance() {
+        ItemStack itemstack = super.ifw_defaultInstance();
+        itemstack.set(DataComponents.MAX_DAMAGE, this.maxDurability());
+        itemstack.set(DataComponents.DAMAGE, this.initalDurability());
+        return itemstack;
+    }
+
     @Override
     protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
         if (isFree(level.getBlockState(pos.below())) && pos.getY() >= level.getMinBuildHeight()) {
-            CompoundTag nbtCompound = new CompoundTag();
-            nbtCompound.putInt("Durability", ((AnvilBlockEntity)level.getBlockEntity(pos)).durability());
-            FallingBlockEntity fallingblockentity = FallingBlockEntity.fall(level, pos, state);
-            fallingblockentity.blockData = nbtCompound;
-            this.configureFallingBlockEntity(fallingblockentity);
+            AnvilBlockEntity blockEntity = (AnvilBlockEntity) level.getBlockEntity(pos);
+            blockEntity.setData(IFWAttachment.anvil_damage.get(), blockEntity.damage());
         }
 
         super.tick(state, level, pos, random);
@@ -78,10 +83,10 @@ protected void configureFallingBlockEntity(FallingBlockEntity entity) {
     }
 
     @Nullable
-    public BlockState damage(int value, BlockEntity tileEntityAnvil) {
+    public BlockState ifw_damage(int value, BlockEntity tileEntityAnvil) {
         if (tileEntityAnvil instanceof AnvilBlockEntity anvilBlockEntity) {
-            anvilBlockEntity.durability(anvilBlockEntity.durability() + value);
-            return this.getBrokeState(anvilBlockEntity.durability());
+            anvilBlockEntity.damage(anvilBlockEntity.damage() + value);
+            return this.getBrokeState(anvilBlockEntity.damage());
         } else {
             return null;
         }
@@ -91,9 +96,9 @@ public BlockState damage(int value, BlockEntity tileEntityAnvil) {
     public BlockState getBrokeState(int currentDamage) {
         if (currentDamage > this.maxDurability())
             throw new IllegalArgumentException("IFWAnvilBlock.GetBrokeState error");
-
-        if (currentDamage <= this.maxDurability() * 0.5F) return this.getDamagedState();
-        else if (currentDamage >= this.maxDurability() * 0.8F) return this.defaultBlockState();
+        int currentDurability = this.maxDurability() - currentDamage;
+        if (currentDurability <= this.maxDurability() * 0.5F) return this.getDamagedState();
+        else if (currentDurability >= this.maxDurability() * 0.8F) return this.defaultBlockState();
         else return this.getChippedState();
     }
 

src/main/java/huix/infinity/common/world/block/entity/AnvilBlockEntity.java

@@ -8,7 +8,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 
 public class AnvilBlockEntity extends BlockEntity {
-    private int durability;
+    private int damage;
 
     public AnvilBlockEntity(BlockPos pos, BlockState blockState) {
         super(IFWBlockEntityTypes.ifw_anvil.get(), pos, blockState);
@@ -17,20 +17,20 @@ public AnvilBlockEntity(BlockPos pos, BlockState blockState) {
     @Override
     protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
         super.loadAdditional(tag, registries);
-        if (tag.contains("Durability")) this.durability = tag.getInt("Durability");
+        if (tag.contains("Damage")) this.damage = tag.getInt("Damage");
     }
 
     @Override
     protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
         super.saveAdditional(tag, registries);
-        if (this.durability != 0) tag.putInt("Durability", this.durability);
+        if (this.damage != 0) tag.putInt("Damage", this.damage);
     }
 
-    public void durability(int durability) {
-        this.durability = durability;
+    public void damage(int durability) {
+        this.damage = durability;
     }
 
-    public int durability() {
-        return this.durability;
+    public int damage() {
+        return this.damage;
     }
 }