Merge pull request #24 from Yazawazi/main

Fix weapon refine

src/main/java/emu/grasscutter/data/def/ItemData.java

@@ -48,6 +48,7 @@ public class ItemData extends GenshinResource {
     private int WeaponBaseExp;
     private int StoryId;
     private int AvatarPromoteId;
+    private int AwakenMaterial;
     private int[] AwakenCosts;
     private int[] SkillAffix;
     private WeaponProperty[] WeaponProp;
@@ -160,6 +161,10 @@ public class ItemData extends GenshinResource {
 		return WeaponBaseExp;
 	}
 	
+	public int getAwakenMaterial() {
+        	return AwakenMaterial;
+    	}
+	
 	public int[] getAwakenCosts() {
 		return AwakenCosts;
 	}

src/main/java/emu/grasscutter/game/managers/InventoryManager.java

@@ -438,9 +438,15 @@ public class InventoryManager {
 			return;
 		}
 		
+		if (weapon.getItemData().getAwakenMaterial() == 0) {
 			if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemId() != feed.getItemId()) {
 				return;
 			}
+		} else {
+			if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemData().getAwakenMaterial() != feed.getItemId()) {
+				return;
+			}
+		}
 		
 		if (weapon.getRefinement() >= 4 || weapon.getAffixes() == null || weapon.getAffixes().size() == 0) {
 			return;