Big World Resources Collection Implement (#1368)

* init

* init

* init

* revoke

* fix error

* mining support

* mining support

* Roks endurance support

* Roks endurance support

* Timed refresh

* upgrade resource data

* Timed refresh support

* remove null gadget

* Coordination

* full synchronized

* oh no, my math teacher will hit me!

* synchronized onInteract

* remove break;

* supply re-spawn time , thanks to @wl23333

* Clean up and integrate collection spawns into SpawnDataEntries

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>

src/main/java/emu/grasscutter/game/entity/gadget/GadgetContent.java

@@ -2,13 +2,12 @@ package emu.grasscutter.game.entity.gadget;
 
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.proto.InterOpTypeOuterClass;
 import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
 import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
 
 public abstract class GadgetContent {
 	private final EntityGadget gadget;
-	
+
 	public GadgetContent(EntityGadget gadget) {
 		this.gadget = gadget;
 	}

src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherObject.java

@@ -0,0 +1,86 @@
+package emu.grasscutter.game.entity.gadget;
+
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.excels.ItemData;
+import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.EntityItem;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.player.Player;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.world.Scene;
+import emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.GatherGadgetInfo;
+import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
+import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
+import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
+import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.Utils;
+
+public class GadgetGatherObject extends GadgetContent {
+	private int itemId;
+	private boolean isForbidGuest;
+	
+	public GadgetGatherObject(EntityGadget gadget) {
+		super(gadget);
+		
+		if (gadget.getSpawnEntry() != null) {
+			this.itemId = gadget.getSpawnEntry().getGatherItemId();
+		}
+	}
+	
+	public int getItemId() {
+		return this.itemId;
+	}
+
+	public boolean isForbidGuest() {
+		return isForbidGuest;
+	}
+
+	public boolean onInteract(Player player, GadgetInteractReq req) {
+		// Sanity check
+		ItemData itemData = GameData.getItemDataMap().get(getItemId());
+		if (itemData == null) {
+			return false;
+		}
+
+		GameItem item = new GameItem(itemData, 1);
+		player.getInventory().addItem(item, ActionReason.Gather);
+		
+		getGadget().getScene().broadcastPacket(new PacketGadgetInteractRsp(getGadget(), InteractType.INTERACT_TYPE_GATHER));
+
+		return true;
+	}
+
+	public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
+		GatherGadgetInfo gatherGadgetInfo = GatherGadgetInfo.newBuilder()
+				.setItemId(this.getItemId())
+				.setIsForbidGuest(this.isForbidGuest())
+				.build();
+
+		gadgetInfo.setGatherGadget(gatherGadgetInfo);
+	}
+
+	public void dropItems(Player player) {
+		Scene scene = getGadget().getScene();
+		int times = Utils.randomRange(1,2);
+		
+        for (int i = 0 ; i < times ; i++) {
+            EntityItem item = new EntityItem(
+            		scene,
+            		player,
+                    GameData.getItemDataMap().get(itemId),
+                    new Position(
+                            getGadget().getPosition().getX() + (float)Utils.randomRange(1,5) / 5,
+                            getGadget().getPosition().getY() + 2f,
+                            getGadget().getPosition().getZ() + (float)Utils.randomRange(1,5) / 5
+                    ),
+                    1,
+                    true);
+            
+            scene.addEntity(item);
+        }
+        
+        scene.killEntity(this.getGadget(), player.getTeamManager().getCurrentAvatarEntity().getId());
+        // Todo: add record
+	}
+}

src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherPoint.java

@@ -3,31 +3,43 @@ package emu.grasscutter.game.entity.gadget;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.excels.GatherData;
 import emu.grasscutter.game.entity.EntityGadget;
+import emu.grasscutter.game.entity.EntityItem;
 import emu.grasscutter.game.inventory.GameItem;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.GatherGadgetInfo;
 import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq;
 import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
+import emu.grasscutter.utils.Position;
+import emu.grasscutter.utils.Utils;
 
 public class GadgetGatherPoint extends GadgetContent {
-	private GatherData gatherData;
+	private int itemId;
+	private boolean isForbidGuest;
 	
 	public GadgetGatherPoint(EntityGadget gadget) {
 		super(gadget);
-		this.gatherData = GameData.getGatherDataMap().get(gadget.getPointType());
-	}
-	
-	public GatherData getGatherData() {
-		return gatherData;
+		
+		if (gadget.getSpawnEntry() != null) {
+			this.itemId = gadget.getSpawnEntry().getGatherItemId();
+		} else {
+			GatherData gatherData = GameData.getGatherDataMap().get(gadget.getPointType());
+			this.itemId = gatherData.getItemId();
+			this.isForbidGuest = gatherData.isForbidGuest();
+		}
 	}
 	
 	public int getItemId() {
-		return getGatherData().getItemId();
+		return this.itemId;
+	}
+
+	public boolean isForbidGuest() {
+		return isForbidGuest;
 	}
 
 	public boolean onInteract(Player player, GadgetInteractReq req) {
-		GameItem item = new GameItem(gatherData.getItemId(), 1);
+		GameItem item = new GameItem(getItemId(), 1);
 		
 		player.getInventory().addItem(item, ActionReason.Gather);
 		
@@ -37,9 +49,33 @@ public class GadgetGatherPoint extends GadgetContent {
 	public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
 		GatherGadgetInfo gatherGadgetInfo = GatherGadgetInfo.newBuilder()
 				.setItemId(this.getItemId())
-				.setIsForbidGuest(this.getGatherData().isForbidGuest())
+				.setIsForbidGuest(this.isForbidGuest())
 				.build();
 
 		gadgetInfo.setGatherGadget(gatherGadgetInfo);
 	}
+
+	public void dropItems(Player player) {
+		Scene scene = getGadget().getScene();
+		int times = Utils.randomRange(1,2);
+		
+        for (int i = 0 ; i < times ; i++) {
+            EntityItem item = new EntityItem(
+            		scene,
+            		player,
+                    GameData.getItemDataMap().get(itemId),
+                    new Position(
+                            getGadget().getPosition().getX() + (float)Utils.randomRange(1,5) / 5,
+                            getGadget().getPosition().getY() + 2f,
+                            getGadget().getPosition().getZ() + (float)Utils.randomRange(1,5) / 5
+                    ),
+                    1,
+                    true);
+            
+            scene.addEntity(item);
+        }
+        
+        scene.killEntity(this.getGadget(), player.getTeamManager().getCurrentAvatarEntity().getId());
+        // Todo: add record
+	}
 }