From d0ecd7349afcf1150cd961d676379b775c4745c5 Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Mon, 24 Jun 2024 13:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E6=AD=A6=E5=99=A8=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E6=89=80=E9=9C=80=E7=BB=8F=E9=AA=8C=EF=BC=8C=E5=87=8F?=
 =?UTF-8?q?=E5=B0=91=E5=BC=B9=E8=8D=AF=E5=88=B6=E9=80=A0=E6=88=90=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/mcreator/target/event/PlayerEventHandler.java    | 2 +-
 .../net/mcreator/target/item/common/ammo/HandgunAmmo.java     | 2 +-
 .../net/mcreator/target/item/common/ammo/HandgunAmmoBox.java  | 2 +-
 .../java/net/mcreator/target/item/common/ammo/RifleAmmo.java  | 2 +-
 .../net/mcreator/target/item/common/ammo/RifleAmmoBox.java    | 2 +-
 .../net/mcreator/target/item/common/ammo/ShotgunAmmo.java     | 2 +-
 .../net/mcreator/target/item/common/ammo/ShotgunAmmoBox.java  | 2 +-
 .../java/net/mcreator/target/item/common/ammo/SniperAmmo.java | 2 +-
 .../net/mcreator/target/item/common/ammo/SniperAmmoBox.java   | 2 +-
 .../resources/data/target/recipes/handgun_ammo_crafting.json  | 2 +-
 .../resources/data/target/recipes/rifle_ammo_crafting.json    | 2 +-
 .../resources/data/target/recipes/shotgun_ammo_crafting.json  | 4 ++--
 .../resources/data/target/recipes/sniper_ammo_crafting.json   | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java
index bd52971b8..082c78e90 100644
--- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java
+++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java
@@ -127,7 +127,7 @@ public class PlayerEventHandler {
             if (tag.getInt("level") == 0) {
                 tag.putDouble("exp2", 20);
             } else {
-                tag.putDouble("exp2", (tag.getDouble("exp1") + tag.getInt("level") * 500));
+                tag.putDouble("exp2", (tag.getDouble("exp1") + tag.getInt("level") * 200 * (1 + 0.1 * tag.getInt("level"))));
             }
             if (tag.getDouble("damagetotal") >= tag.getDouble("exp2")) {
                 tag.putDouble("exp1", (tag.getDouble("exp2")));
diff --git a/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmo.java b/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmo.java
index 285174a02..f09b20ea2 100644
--- a/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmo.java
+++ b/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmo.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 public class HandgunAmmo extends AmmoSupplierItem {
     public HandgunAmmo() {
-        super(GunInfo.Type.HANDGUN, 5, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
+        super(GunInfo.Type.HANDGUN, 10, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
     }
 
     @Override
diff --git a/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmoBox.java b/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmoBox.java
index da41f6177..ac3b48db3 100644
--- a/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmoBox.java
+++ b/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmoBox.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 public class HandgunAmmoBox extends AmmoSupplierItem {
     public HandgunAmmoBox() {
-        super(GunInfo.Type.HANDGUN, 30, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
+        super(GunInfo.Type.HANDGUN, 60, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
     }
 
     @Override
diff --git a/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmo.java b/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmo.java
index 6a14a9ee0..845f5fd2a 100644
--- a/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmo.java
+++ b/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmo.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 public class RifleAmmo extends AmmoSupplierItem {
     public RifleAmmo() {
-        super(GunInfo.Type.RIFLE, 5, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
+        super(GunInfo.Type.RIFLE, 10, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
     }
 
     @Override
diff --git a/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmoBox.java b/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmoBox.java
index 577985527..0df901f93 100644
--- a/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmoBox.java
+++ b/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmoBox.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 public class RifleAmmoBox extends AmmoSupplierItem {
     public RifleAmmoBox() {
-        super(GunInfo.Type.RIFLE, 30, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
+        super(GunInfo.Type.RIFLE, 60, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
     }
 
     @Override
diff --git a/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmo.java b/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmo.java
index ce53fa301..bfa2127fe 100644
--- a/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmo.java
+++ b/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmo.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 public class ShotgunAmmo extends AmmoSupplierItem {
     public ShotgunAmmo() {
-        super(GunInfo.Type.SHOTGUN, 2, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
+        super(GunInfo.Type.SHOTGUN, 4, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
     }
 
     @Override
diff --git a/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmoBox.java b/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmoBox.java
index 434537d1f..ea1b32291 100644
--- a/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmoBox.java
+++ b/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmoBox.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 public class ShotgunAmmoBox extends AmmoSupplierItem {
     public ShotgunAmmoBox() {
-        super(GunInfo.Type.SHOTGUN, 12, new Item.Properties().stacksTo(8).rarity(Rarity.COMMON));
+        super(GunInfo.Type.SHOTGUN, 24, new Item.Properties().stacksTo(8).rarity(Rarity.COMMON));
     }
 
     @Override
diff --git a/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmo.java b/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmo.java
index 775036bda..2f52b68cc 100644
--- a/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmo.java
+++ b/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmo.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 public class SniperAmmo extends AmmoSupplierItem {
     public SniperAmmo() {
-        super(GunInfo.Type.SNIPER, 2, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
+        super(GunInfo.Type.SNIPER, 4, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
     }
 
     @Override
diff --git a/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmoBox.java b/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmoBox.java
index 753c79aae..4c9073625 100644
--- a/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmoBox.java
+++ b/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmoBox.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 public class SniperAmmoBox extends AmmoSupplierItem {
     public SniperAmmoBox() {
-        super(GunInfo.Type.SNIPER, 12, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
+        super(GunInfo.Type.SNIPER, 24, new Item.Properties().stacksTo(64).rarity(Rarity.COMMON));
     }
 
     @Override
diff --git a/src/main/resources/data/target/recipes/handgun_ammo_crafting.json b/src/main/resources/data/target/recipes/handgun_ammo_crafting.json
index 9efb1bd76..e723188a7 100644
--- a/src/main/resources/data/target/recipes/handgun_ammo_crafting.json
+++ b/src/main/resources/data/target/recipes/handgun_ammo_crafting.json
@@ -18,6 +18,6 @@
   },
   "result": {
     "item": "target:handgun_ammo",
-    "count": 3
+    "count": 6
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/target/recipes/rifle_ammo_crafting.json b/src/main/resources/data/target/recipes/rifle_ammo_crafting.json
index 8565f6c1c..d30c6bd94 100644
--- a/src/main/resources/data/target/recipes/rifle_ammo_crafting.json
+++ b/src/main/resources/data/target/recipes/rifle_ammo_crafting.json
@@ -19,6 +19,6 @@
   },
   "result": {
     "item": "target:rifle_ammo",
-    "count": 3
+    "count": 6
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/target/recipes/shotgun_ammo_crafting.json b/src/main/resources/data/target/recipes/shotgun_ammo_crafting.json
index d0a75811a..be8998246 100644
--- a/src/main/resources/data/target/recipes/shotgun_ammo_crafting.json
+++ b/src/main/resources/data/target/recipes/shotgun_ammo_crafting.json
@@ -2,7 +2,7 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "pattern": [
-    "aba",
+    " b ",
     "aba",
     "cdc"
   ],
@@ -22,6 +22,6 @@
   },
   "result": {
     "item": "target:shotgun_ammo",
-    "count": 3
+    "count": 6
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/target/recipes/sniper_ammo_crafting.json b/src/main/resources/data/target/recipes/sniper_ammo_crafting.json
index db217bc60..0f96f1570 100644
--- a/src/main/resources/data/target/recipes/sniper_ammo_crafting.json
+++ b/src/main/resources/data/target/recipes/sniper_ammo_crafting.json
@@ -19,6 +19,6 @@
   },
   "result": {
     "item": "target:sniper_ammo",
-    "count": 3
+    "count": 6
   }
 }
\ No newline at end of file