BETA: Datapack part for [L6161].

	* Cleanup of empty folders.

L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java

@@ -680,8 +680,6 @@ public class RainbowSpringsChateau extends Quest
 			return null;
 		}
 		
-		final int itemId = item.getItemId();
-		
 		// Nectar must spawn the enraged yeti. Dunno if it makes any other thing
 		// Also, the items must execute:
 		// - Reduce gourd hpb ( reduceGourdHp(int, L2PcInstance) )
@@ -689,6 +687,7 @@ public class RainbowSpringsChateau extends Quest
 		// - Change arena gourds ( moveGourds() )
 		// - Increase gourd hp ( increaseGourdHp(int) )
 		
+		final int itemId = item.getId();
 		if (itemId == RAINBOW_NECTAR)
 		{
 			// Spawn enraged (where?)

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditNpc.java

@@ -1130,7 +1130,7 @@ public class AdminEditNpc implements IAdminCommandHandler
 					continue;
 				}
 				
-				sb.append("Name: <font color=\"LEVEL\">[" + item.getName() + "]</font> ID: <font color=\"LEVEL\">[" + item.getItemId() + "]</font> Category: <font color=\"LEVEL\">[" + dropCategory.getCategoryType() + "]</font>");
+				sb.append("Name: <font color=\"LEVEL\">[" + item.getName() + "]</font> ID: <font color=\"LEVEL\">[" + item.getId() + "]</font> Category: <font color=\"LEVEL\">[" + dropCategory.getCategoryType() + "]</font>");
 				sb.append("<table width=277 height=32 cellspacing=0 background=\"L2UI_CT1.Windows.Windows_DF_TooltipBG\">");
 				sb.append("<tr><td fixwidth=32 background=\"" + item.getIcon() + "\"></td>");
 				sb.append("<td fixwidth=64 align=center>");
@@ -1143,7 +1143,7 @@ public class AdminEditNpc implements IAdminCommandHandler
 				sb.append(dropData.getChance());
 				sb.append("</td>");
 				sb.append("<td fixwidth=45>");
-				sb.append("<button action=\"bypass admin_del_drop " + npc.getId() + " " + dropCategory.getCategoryType() + " " + item.getItemId() + " " + page + "\" value=\"Delete\" width=45 height=30 back=\"L2UI_CT1.Button_DF_Calculator_Down\" fore=\"L2UI_CT1.Button_DF_Calculator\">");
+				sb.append("<button action=\"bypass admin_del_drop " + npc.getId() + " " + dropCategory.getCategoryType() + " " + item.getId() + " " + page + "\" value=\"Delete\" width=45 height=30 back=\"L2UI_CT1.Button_DF_Calculator_Down\" fore=\"L2UI_CT1.Button_DF_Calculator\">");
 				sb.append("</td></tr></table>");
 				
 				i++;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/FishingSkill.java

@@ -80,7 +80,7 @@ public class FishingSkill implements ISkillHandler
 		{
 			SS = 2;
 		}
-		L2FishingRod fishingRod = FishingRodsData.getInstance().getFishingRod(weaponItem.getItemId());
+		L2FishingRod fishingRod = FishingRodsData.getInstance().getFishingRod(weaponItem.getId());
 		double gradeBonus = fishingRod.getFishingRodLevel() * 0.1; // TODO: Check this formula (is guessed)
 		final L2Skill expertiseSkill = SkillTable.getInstance().getInfo(1315, player.getSkillLevel(1315));
 		int dmg = (int) ((fishingRod.getFishingRodDamage() + expertiseSkill.getPower() + skill.getPower()) * gradeBonus * SS);