src/main/java/emu/grasscutter/data/GameData.java

@@ -75,7 +75,6 @@ public class GameData {
 	private static final Int2ObjectMap<ShopGoodsData> shopGoodsDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<CombineData> combineDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<RewardPreviewData> rewardPreviewDataMap = new Int2ObjectOpenHashMap<>();
-	private static final Int2ObjectMap<GatherData> gatherDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<TowerFloorData> towerFloorDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<TowerLevelData> towerLevelDataMap = new Int2ObjectOpenHashMap<>();
 	private static final Int2ObjectMap<TowerScheduleData> towerScheduleDataMap = new Int2ObjectOpenHashMap<>();
@@ -348,8 +347,4 @@ public class GameData {
 	public static Int2ObjectMap<QuestData> getQuestDataMap() {
 		return questDataMap;
 	}
-
-	public static Int2ObjectMap<GatherData> getGatherDataMap() {
-		return gatherDataMap;
-	}
 }

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

@@ -1,49 +0,0 @@
-package emu.grasscutter.data.def;
-
-import emu.grasscutter.data.GameResource;
-import emu.grasscutter.data.ResourceType;
-
-@ResourceType(name = "GatherExcelConfigData.json")
-public class GatherData extends GameResource {
-	private int PointType;
-	private int Id;
-	private int GadgetId;
-	private int ItemId;
-	private int Cd; // Probably hours
-	private boolean IsForbidGuest;
-	private boolean InitDisableInteract;
-	    
-	@Override
-	public int getId() {
-		return this.PointType;
-	}
-
-	public int getGatherId() {
-		return Id;
-	}
-
-	public int getGadgetId() {
-		return GadgetId;
-	}
-
-	public int getItemId() {
-		return ItemId;
-	}
-
-	public int getCd() {
-		return Cd;
-	}
-
-	public boolean isForbidGuest() {
-		return IsForbidGuest;
-	}
-
-	public boolean initDisableInteract() {
-		return InitDisableInteract;
-	}
-
-	@Override
-	public void onLoad() {
-
-	}
-}

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

@@ -12,6 +12,7 @@ public class SceneData extends GameResource {
 	private SceneType Type;
 	private String ScriptData;
 
+	    
 	@Override
 	public int getId() {
 		return this.Id;

src/main/java/emu/grasscutter/game/entity/EntityGadget.java

@@ -3,15 +3,9 @@ package emu.grasscutter.game.entity;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.def.GadgetData;
-import emu.grasscutter.game.entity.gadget.GadgetChest;
-import emu.grasscutter.game.entity.gadget.GadgetContent;
-import emu.grasscutter.game.entity.gadget.GadgetGatherPoint;
-import emu.grasscutter.game.entity.gadget.GadgetRewardStatue;
-import emu.grasscutter.game.entity.gadget.GadgetWorktop;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.EntityIdType;
 import emu.grasscutter.game.props.EntityType;
-import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.PlayerProperty;
 import emu.grasscutter.game.world.Scene;
 import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo;
@@ -28,7 +22,6 @@ import emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
 import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 import emu.grasscutter.net.proto.WorktopInfoOuterClass.WorktopInfo;
-import emu.grasscutter.server.packet.send.PacketGadgetStateNotify;
 import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.ProtoHelper;
 import it.unimi.dsi.fastutil.ints.Int2FloatOpenHashMap;
@@ -47,8 +40,7 @@ public class EntityGadget extends EntityBaseGadget {
 	private int gadgetId;
 	
 	private int state;
-	private int pointType;
+	private IntSet worktopOptions;
-	private GadgetContent content;
 
 	public EntityGadget(Scene scene, int gadgetId, Position pos) {
 		super(scene);
@@ -59,22 +51,19 @@ public class EntityGadget extends EntityBaseGadget {
 		this.rot = new Position();
 	}
 	
-	public EntityGadget(Scene scene, int gadgetId, Position pos, GadgetContent content) {
-		this(scene, gadgetId, pos);
-		this.content = content;
-	}
-	
 	public GadgetData getGadgetData() {
 		return data;
 	}
 
 	@Override
 	public Position getPosition() {
+		// TODO Auto-generated method stub
 		return this.pos;
 	}
 
 	@Override
 	public Position getRotation() {
+		// TODO Auto-generated method stub
 		return this.rot;
 	}
 	
@@ -94,48 +83,27 @@ public class EntityGadget extends EntityBaseGadget {
 		this.state = state;
 	}
 
-	public void updateState(int state){
+	public IntSet getWorktopOptions() {
-		this.setState(state);
+		return worktopOptions;
-		this.getScene().broadcastPacket(new PacketGadgetStateNotify(this, state));
 	}
 	
-	public int getPointType() {
+	public void addWorktopOptions(int[] options) {
-		return pointType;
+		if (this.worktopOptions == null) {
+			this.worktopOptions = new IntOpenHashSet();
+		}
+		Arrays.stream(options).forEach(this.worktopOptions::add);
 	}
 	
-	public void setPointType(int pointType) {
+	public void removeWorktopOption(int option) {
-		this.pointType = pointType;
+		if (this.worktopOptions == null) {
-	}
-
-	public GadgetContent getContent() {
-		return content;
-	}
-
-	@Deprecated // Dont use!
-	public void setContent(GadgetContent content) {
-		this.content = this.content == null ? content : this.content;
-	}
-	
-	// TODO refactor
-	public void buildContent() {
-		if (getContent() != null || getGadgetData() == null || getGadgetData().getType() == null) {
 			return;
 		}
-		
+		this.worktopOptions.remove(option);
-		EntityType type = getGadgetData().getType();
-		GadgetContent content = switch (type) {
-			case GatherPoint -> new GadgetGatherPoint(this);
-			case Worktop -> new GadgetWorktop(this);
-			case RewardStatue -> new GadgetRewardStatue(this);
-			case Chest -> new GadgetChest(this);
-			default -> null;
-		};
-		
-		this.content = content;
 	}
 
 	@Override
 	public Int2FloatOpenHashMap getFightProperties() {
+		// TODO Auto-generated method stub
 		return null;
 	}
 
@@ -176,12 +144,41 @@ public class EntityGadget extends EntityBaseGadget {
 				.setIsEnableInteract(true)
 				.setAuthorityPeerId(this.getScene().getWorld().getHostPeerId());
 		
-		if (this.getContent() != null) {
+		if (this.getGadgetData().getType() == EntityType.Worktop && this.getWorktopOptions() != null) {
-			this.getContent().onBuildProto(gadgetInfo);
+			WorktopInfo worktop = WorktopInfo.newBuilder()
+					.addAllOptionList(this.getWorktopOptions())
+					.build();
+			gadgetInfo.setWorktop(worktop);
 		}
 
 		entityInfo.setGadget(gadgetInfo);
 		
 		return entityInfo.build();
 	}
+
+    public void openChest(Player player) {
+		var chestRewardMap = getScene().getWorld().getServer().getWorldDataManager().getChestRewardMap();
+		var chestReward = chestRewardMap.get(this.getGadgetData().getJsonName());
+		if(chestReward == null){
+			Grasscutter.getLogger().warn("Could not found the config of this type of Chests {}", this.getGadgetData().getJsonName());
+			return;
+		}
+
+		player.earnExp(chestReward.getAdvExp());
+		player.getInventory().addItem(201, chestReward.getResin());
+
+		var mora = chestReward.getMora() * (1 + (player.getWorldLevel() - 1) * 0.5);
+		player.getInventory().addItem(202, (int)mora);
+
+		for(int i=0;i<chestReward.getContent().size();i++){
+			getScene().addItemEntity(chestReward.getContent().get(i).getItemId(), chestReward.getContent().get(i).getCount(), this);
+		}
+
+		var random = new Random(System.currentTimeMillis());
+		for(int i=0;i<chestReward.getRandomCount();i++){
+			var index = random.nextInt(chestReward.getRandomContent().size());
+			var item = chestReward.getRandomContent().get(index);
+			getScene().addItemEntity(item.getItemId(), item.getCount(), this);
+		}
+    }
 }

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

@@ -1,53 +0,0 @@
-package emu.grasscutter.game.entity.gadget;
-
-import java.util.Random;
-
-import emu.grasscutter.Grasscutter;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
-import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
-import emu.grasscutter.scripts.constants.ScriptGadgetState;
-import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
-
-public class GadgetChest extends GadgetContent {
-	
-	public GadgetChest(EntityGadget gadget) {
-		super(gadget);
-	}
-
-	public boolean onInteract(Player player) {
-		var chestRewardMap = getGadget().getScene().getWorld().getServer().getWorldDataManager().getChestRewardMap();
-		var chestReward = chestRewardMap.get(getGadget().getGadgetData().getJsonName());
-		if (chestReward == null) {
-			Grasscutter.getLogger().warn("Could not found the config of this type of Chests {}", getGadget().getGadgetData().getJsonName());
-			return true;
-		}
-
-		player.earnExp(chestReward.getAdvExp());
-		player.getInventory().addItem(201, chestReward.getResin());
-
-		var mora = chestReward.getMora() * (1 + (player.getWorldLevel() - 1) * 0.5);
-		player.getInventory().addItem(202, (int)mora);
-
-		for(int i=0;i<chestReward.getContent().size();i++){
-			getGadget().getScene().addItemEntity(chestReward.getContent().get(i).getItemId(), chestReward.getContent().get(i).getCount(), getGadget());
-		}
-
-		var random = new Random(System.currentTimeMillis());
-		for(int i=0;i<chestReward.getRandomCount();i++){
-			var index = random.nextInt(chestReward.getRandomContent().size());
-			var item = chestReward.getRandomContent().get(index);
-			getGadget().getScene().addItemEntity(item.getItemId(), item.getCount(), getGadget());
-		}
-		
-		getGadget().updateState(ScriptGadgetState.ChestOpened);
-		player.sendPacket(new PacketGadgetInteractRsp(getGadget(), InteractType.INTERACT_OPEN_CHEST));
-		
-		return true;
-	}
-
-	public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
-
-	}
-}

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

@@ -1,21 +0,0 @@
-package emu.grasscutter.game.entity.gadget;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
-
-public abstract class GadgetContent {
-	private final EntityGadget gadget;
-	
-	public GadgetContent(EntityGadget gadget) {
-		this.gadget = gadget;
-	}
-
-	public EntityGadget getGadget() {
-		return gadget;
-	}
-	
-	public abstract boolean onInteract(Player player);
-	
-	public abstract void onBuildProto(SceneGadgetInfo.Builder gadgetInfo);
-}

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

@@ -1,44 +0,0 @@
-package emu.grasscutter.game.entity.gadget;
-
-import emu.grasscutter.data.GameData;
-import emu.grasscutter.data.def.GatherData;
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.GatherGadgetInfo;
-import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
-
-public class GadgetGatherPoint extends GadgetContent {
-	private GatherData gatherData;
-	
-	public GadgetGatherPoint(EntityGadget gadget) {
-		super(gadget);
-		this.gatherData = GameData.getGatherDataMap().get(gadget.getPointType());
-	}
-	
-	public GatherData getGatherData() {
-		return gatherData;
-	}
-	
-	public int getItemId() {
-		return getGatherData().getItemId();
-	}
-
-	public boolean onInteract(Player player) {
-		GameItem item = new GameItem(gatherData.getItemId(), 1);
-		
-		player.getInventory().addItem(item, ActionReason.Gather);
-		
-		return true;
-	}
-
-	public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
-		GatherGadgetInfo gatherGadgetInfo = GatherGadgetInfo.newBuilder()
-				.setItemId(this.getItemId())
-				.setIsForbidGuest(this.getGatherData().isForbidGuest())
-				.build();
-
-		gadgetInfo.setGatherGadget(gatherGadgetInfo);
-	}
-}

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

@@ -1,28 +0,0 @@
-package emu.grasscutter.game.entity.gadget;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType;
-import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
-import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
-
-public class GadgetRewardStatue extends GadgetContent {
-	
-	public GadgetRewardStatue(EntityGadget gadget) {
-		super(gadget);
-	}
-
-	public boolean onInteract(Player player) {
-		if (player.getScene().getChallenge() != null) {
-			player.getScene().getChallenge().getStatueDrops(player);
-		}
-		
-		player.sendPacket(new PacketGadgetInteractRsp(getGadget(), InteractType.INTERACT_OPEN_STATUE));
-		
-		return false;
-	}
-
-	public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
-		
-	}
-}

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

@@ -1,52 +0,0 @@
-package emu.grasscutter.game.entity.gadget;
-
-import java.util.Arrays;
-
-import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.player.Player;
-import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
-import emu.grasscutter.net.proto.WorktopInfoOuterClass.WorktopInfo;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.ints.IntSet;
-
-public class GadgetWorktop extends GadgetContent {
-	private IntSet worktopOptions;
-	
-	public GadgetWorktop(EntityGadget gadget) {
-		super(gadget);
-	}
-	
-	public IntSet getWorktopOptions() {
-		return worktopOptions;
-	}
-	
-	public void addWorktopOptions(int[] options) {
-		if (this.worktopOptions == null) {
-			this.worktopOptions = new IntOpenHashSet();
-		}
-		Arrays.stream(options).forEach(this.worktopOptions::add);
-	}
-	
-	public void removeWorktopOption(int option) {
-		if (this.worktopOptions == null) {
-			return;
-		}
-		this.worktopOptions.remove(option);
-	}
-
-	public boolean onInteract(Player player) {
-		return false;
-	}
-
-	public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
-		if (this.worktopOptions == null) {
-			return;
-		}
-		
-		WorktopInfo worktop = WorktopInfo.newBuilder()
-				.addAllOptionList(this.getWorktopOptions())
-				.build();
-		
-		gadgetInfo.setWorktop(worktop);
-	}
-}

src/main/java/emu/grasscutter/game/player/Player.java

@@ -918,20 +918,29 @@ public class Player {
 				else
 					this.getScene().broadcastPacket(new PacketGadgetInteractRsp(drop, InteractType.INTERACT_PICK_ITEM));
 			}
-		} else if (entity instanceof EntityGadget gadget) {
+		} else if (entity instanceof EntityGadget) {
-			if (gadget.getContent() == null) {
+			EntityGadget gadget = (EntityGadget) entity;
-				return;
+			
+			if (gadget.getGadgetData().getType() == EntityType.RewardStatue) {
+				if (scene.getChallenge() != null) {
+					scene.getChallenge().getStatueDrops(this);
+				}
+				
+				this.sendPacket(new PacketGadgetInteractRsp(gadget, InteractType.INTERACT_OPEN_STATUE));
 			}
+			else if (gadget.getGadgetData().getType() == EntityType.Chest) {
+				getScene().updateGadgetState(gadget, ScriptGadgetState.ChestOpened);
+				gadget.openChest(this);
 
-			boolean shouldDelete = gadget.getContent().onInteract(this);
+				this.sendPacket(new PacketGadgetInteractRsp(gadget, InteractType.INTERACT_OPEN_CHEST));
-			
+				getScene().killEntity(gadget, 0);
-			if (shouldDelete) {
-				entity.getScene().removeEntity(entity);
 			}
 		} else {
 			// Delete directly
 			entity.getScene().removeEntity(entity);
 		}
+
+		return;
 	}
 
 	public void onPause() {

src/main/java/emu/grasscutter/game/world/Scene.java

@@ -20,7 +20,6 @@ import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType;
 import emu.grasscutter.scripts.SceneIndexManager;
 import emu.grasscutter.scripts.SceneScriptManager;
 import emu.grasscutter.scripts.data.SceneBlock;
-import emu.grasscutter.scripts.data.SceneGadget;
 import emu.grasscutter.scripts.data.SceneGroup;
 import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.Position;
@@ -531,14 +530,13 @@ public class Scene {
 	public List<SceneGroup> playerMeetGroups(Player player, SceneBlock block){
 		int RANGE = 100;
 
-		List<SceneGroup> sceneGroups = SceneIndexManager.queryNeighbors(block.sceneGroupIndex, player.getPos(), RANGE);
+		var sceneGroups = SceneIndexManager.queryNeighbors(block.sceneGroupIndex, player.getPos(), RANGE);
 
-		List<SceneGroup> groups = sceneGroups.stream()
+		var groups = new ArrayList<>(sceneGroups.stream()
 				.filter(group -> !scriptManager.getLoadedGroupSetPerBlock().get(block.id).contains(group))
-				.peek(group -> scriptManager.getLoadedGroupSetPerBlock().get(block.id).add(group))
+				.peek(group -> scriptManager.getLoadedGroupSetPerBlock().get(block.id).add(group)).toList());
-				.toList();
 
-		if (groups.size() == 0) {
+		if(groups.size() == 0){
 			return List.of();
 		}
 
@@ -576,14 +574,6 @@ public class Scene {
 				continue;
 			}
 
-			// Load garbages
-			List<SceneGadget> garbageGadgets = group.getGarbageGadgets();
-			
-			if (garbageGadgets != null) {
-				garbageGadgets.forEach(g -> scriptManager.createGadget(group.id, group.block_id, g));
-			}
-
-			// Load suites
 			int suite = group.init_config.suite;
 
 			if (suite == 0) {
@@ -707,4 +697,9 @@ public class Scene {
 			addEntity(entity);
 		}
 	}
+
+	public void updateGadgetState(EntityGadget gadget, int state){
+		gadget.setState(state);
+		broadcastPacket(new PacketGadgetStateNotify(gadget, state));
+	}
 }

src/main/java/emu/grasscutter/scripts/SceneScriptManager.java

@@ -351,11 +351,6 @@ public class SceneScriptManager {
 		entity.setGroupId(groupId);
 		entity.getRotation().set(g.rot);
 		entity.setState(g.state);
-		entity.setPointType(g.point_type);
-		entity.buildContent();
-		
-		// Lua event
-		this.callEvent(EventType.EVENT_GADGET_CREATE, new ScriptArgs(entity.getConfigId()));
 
 		return entity;
 	}
@@ -394,22 +389,31 @@ public class SceneScriptManager {
 		this.getScriptMonsterSpawnService()
 				.onMonsterCreatedListener.forEach(action -> action.onNotify(entity));
 
-		// Lua event
-		callEvent(EventType.EVENT_ANY_MONSTER_LIVE, new ScriptArgs(entity.getConfigId()));
-
 		return entity;
 	}
 
 	public void addEntity(GameEntity gameEntity){
 		getScene().addEntity(gameEntity);
+		callCreateEvent(gameEntity);
 	}
-	
 	public void meetEntities(List<? extends GameEntity> gameEntity){
 		getScene().addEntities(gameEntity, VisionTypeOuterClass.VisionType.VISION_MEET);
+		gameEntity.forEach(this::callCreateEvent);
 	}
-	
 	public void addEntities(List<? extends GameEntity> gameEntity){
 		getScene().addEntities(gameEntity);
+		gameEntity.forEach(this::callCreateEvent);
+	}
+	public void callCreateEvent(GameEntity gameEntity){
+		if(!isInit){
+			return;
+		}
+		if(gameEntity instanceof EntityMonster entityMonster){
+			callEvent(EventType.EVENT_ANY_MONSTER_LIVE, new ScriptArgs(entityMonster.getConfigId()));
+		}
+		if(gameEntity instanceof EntityGadget entityGadget){
+			this.callEvent(EventType.EVENT_GADGET_CREATE, new ScriptArgs(entityGadget.getConfigId()));
+		}
 	}
 
 	public PhTree<SceneBlock> getBlocksIndex() {

src/main/java/emu/grasscutter/scripts/ScriptLib.java

@@ -4,7 +4,6 @@ import emu.grasscutter.game.dungeons.DungeonChallenge;
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.entity.EntityMonster;
 import emu.grasscutter.game.entity.GameEntity;
-import emu.grasscutter.game.entity.gadget.GadgetWorktop;
 import emu.grasscutter.scripts.data.SceneGroup;
 import emu.grasscutter.scripts.data.SceneRegion;
 import emu.grasscutter.server.packet.send.PacketCanUseSkillNotify;
@@ -95,22 +94,21 @@ public class ScriptLib {
 	public int SetWorktopOptionsByGroupId(int groupId, int configId, int[] options) {
 		logger.debug("[LUA] Call SetWorktopOptionsByGroupId with {},{},{}",
 				groupId,configId,options);
-		
 		Optional<GameEntity> entity = getSceneScriptManager().getScene().getEntities().values().stream()
 				.filter(e -> e.getConfigId() == configId && e.getGroupId() == groupId).findFirst();
 
-
+		if (entity.isEmpty()) {
-		if (entity.isEmpty() || !(entity.get() instanceof EntityGadget gadget)) {
 			return 1;
 		}
 		
-		if (!(gadget.getContent() instanceof GadgetWorktop worktop)) {
+		if (!(entity.get() instanceof EntityGadget)) {
 			return 1;
 		}
 		
-		worktop.addWorktopOptions(options);
+		EntityGadget gadget = (EntityGadget) entity.get();
+		gadget.addWorktopOptions(options);
+
 		getSceneScriptManager().getScene().broadcastPacket(new PacketWorktopOptionNotify(gadget));
-		
 		return 0;
 	}
 
@@ -125,17 +123,18 @@ public class ScriptLib {
 		Optional<GameEntity> entity = getSceneScriptManager().getScene().getEntities().values().stream()
 				.filter(e -> e.getConfigId() == configId && e.getGroupId() == groupId).findFirst();
 
-		if (entity.isEmpty() || !(entity.get() instanceof EntityGadget gadget)) {
+		if (entity.isEmpty()) {
 			return 1;
 		}
 		
-		if (!(gadget.getContent() instanceof GadgetWorktop worktop)) {
+		if (!(entity.get() instanceof EntityGadget)) {
 			return 1;
 		}
 		
-		worktop.removeWorktopOption(option);
+		EntityGadget gadget = (EntityGadget) entity.get();
+		gadget.removeWorktopOption(option);
+		
 		getSceneScriptManager().getScene().broadcastPacket(new PacketWorktopOptionNotify(gadget));
-		
 		return 0;
 	}
 	
@@ -376,14 +375,11 @@ public class ScriptLib {
 		var configId = table.get("config_id").toint();
 
 		var group = getCurrentGroup();
-		
+		if(group.isEmpty()){
-		if (group.isEmpty()) {
 			return 1;
 		}
-		
 		var gadget = group.get().gadgets.get(configId);
 		var entity = getSceneScriptManager().createGadget(group.get().id, group.get().block_id, gadget);
-		
 		getSceneScriptManager().addEntity(entity);
 
 		return 0;
@@ -440,8 +436,8 @@ public class ScriptLib {
 			return 1;
 		}
 
-		if (entity instanceof EntityGadget entityGadget) {
+		if(entity instanceof EntityGadget entityGadget){
-			entityGadget.updateState(state);
+			getSceneScriptManager().getScene().updateGadgetState(entityGadget, state);
 		}
 
 		return 0;

src/main/java/emu/grasscutter/scripts/ScriptLoader.java

@@ -95,7 +95,7 @@ public class ScriptLoader {
 			return sc.get();
 		}
 
-		Grasscutter.getLogger().info("Loading script " + path);
+		Grasscutter.getLogger().info("Loaded Script" + path);
 
 		File file = new File(path);
 
@@ -106,7 +106,7 @@ public class ScriptLoader {
 			scriptsCache.put(path, new SoftReference<>(script));
 			return script;
 		} catch (Exception e) {
-			Grasscutter.getLogger().error("Loading script {} failed!", path, e);
+			Grasscutter.getLogger().error("Loaded Script {} failed!", path, e);
 			return null;
 		}
 

src/main/java/emu/grasscutter/scripts/data/SceneBusiness.java

@@ -1,10 +0,0 @@
-package emu.grasscutter.scripts.data;
-
-import lombok.Setter;
-import lombok.ToString;
-
-@ToString
-@Setter
-public class SceneBusiness {
-	public int type;
-}

src/main/java/emu/grasscutter/scripts/data/SceneGadget.java

@@ -8,5 +8,4 @@ import lombok.ToString;
 public class SceneGadget extends SceneObject{
 	public int gadget_id;
 	public int state;
-	public int point_type;
 }

src/main/java/emu/grasscutter/scripts/data/SceneGarbage.java

@@ -1,12 +0,0 @@
-package emu.grasscutter.scripts.data;
-
-import java.util.List;
-
-import lombok.Setter;
-import lombok.ToString;
-
-@ToString
-@Setter
-public class SceneGarbage {
-	public List<SceneGadget> gadgets;
-}

src/main/java/emu/grasscutter/scripts/data/SceneGroup.java

@@ -26,20 +26,21 @@ public class SceneGroup {
 	public int refresh_id;
 	public Position pos;
 
-	public Map<Integer,SceneMonster> monsters; // <ConfigId, Monster>
+	/**
-	public Map<Integer, SceneGadget> gadgets; // <ConfigId, Gadgets>
+	 * ConfigId - Monster
+	 */
+	public Map<Integer,SceneMonster> monsters;
+	/**
+	 * ConfigId - Gadget
+	 */
+	public Map<Integer, SceneGadget> gadgets;
 	public Map<String, SceneTrigger> triggers;
-
 	public List<SceneRegion> regions;
 	public List<SceneSuite> suites;
-	public List<SceneVar> variables;
-	
-	public SceneBusiness business;
-	public SceneGarbage garbages;
 	public SceneInitConfig init_config;
 
+	public List<SceneVar> variables;
 	private transient boolean loaded; // Not an actual variable in the scripts either
-	private transient CompiledScript script;
 
 	public boolean isLoaded() {
 		return loaded;
@@ -49,13 +50,7 @@ public class SceneGroup {
 		this.loaded = loaded;
 	}
 
-	public int getBusinessType() {
+	private transient CompiledScript script; // Not an actual variable in the scripts either
-		return this.business == null ? 0 : this.business.type;
-	}
-	
-	public List<SceneGadget> getGarbageGadgets() {
-		return this.garbages == null ? null : this.garbages.gadgets;
-	}
 
 	public CompiledScript getScript() {
 		return script;
@@ -80,7 +75,6 @@ public class SceneGroup {
 		}
 
 		this.script = cs;
-		
 		// Eval script
 		try {
 			cs.eval(bindings);
@@ -100,13 +94,12 @@ public class SceneGroup {
 
 			suites = ScriptLoader.getSerializer().toList(SceneSuite.class, bindings.get("suites"));
 			regions = ScriptLoader.getSerializer().toList(SceneRegion.class, bindings.get("regions"));
-			garbages = ScriptLoader.getSerializer().toObject(SceneGarbage.class, bindings.get("garbages"));
 			init_config = ScriptLoader.getSerializer().toObject(SceneInitConfig.class, bindings.get("init_config"));
 
 			// Add variables to suite
 			variables = ScriptLoader.getSerializer().toList(SceneVar.class, bindings.get("variables"));
 
-			// Add monsters and gadgets to suite
+			// Add monsters to suite
 			for (SceneSuite suite : suites) {
 				suite.sceneMonsters = new ArrayList<>(
 						suite.monsters.stream()
@@ -133,7 +126,6 @@ public class SceneGroup {
 		} catch (ScriptException e) {
 			Grasscutter.getLogger().error("Error loading group " + id + " in scene " + sceneId, e);
 		}
-		
 		Grasscutter.getLogger().info("group {} in scene {} is loaded successfully.", id, sceneId);
 		return this;
 	}

src/main/java/emu/grasscutter/server/packet/send/PacketWorktopOptionNotify.java

@@ -1,7 +1,6 @@
 package emu.grasscutter.server.packet.send;
 
 import emu.grasscutter.game.entity.EntityGadget;
-import emu.grasscutter.game.entity.gadget.GadgetWorktop;
 import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify;
@@ -14,8 +13,8 @@ public class PacketWorktopOptionNotify extends BasePacket {
 		WorktopOptionNotify.Builder proto = WorktopOptionNotify.newBuilder()
 				.setGadgetEntityId(gadget.getId());
 		
-		if (gadget.getContent() instanceof GadgetWorktop worktop) {
+		if (gadget.getWorktopOptions() != null) {
-			proto.addAllOptionList(worktop.getWorktopOptions());
+			proto.addAllOptionList(gadget.getWorktopOptions());
 		}
 		
 		this.setData(proto);