Merge remote-tracking branch 'origin/master' into feat/jerrysworkshop

# Conflicts:
#	configuration/skyblock/Minestom.regions.csv

Author: ArikSquad

commons/src/main/java/net/swofty/commons/skyblock/item/ItemType.java

@@ -74,6 +74,7 @@ public enum ItemType {
 	REZAR_ABICASE(Material.PLAYER_HEAD, Rarity.RARE),
 	SUMSUNG_G3_ABICASE(Material.PLAYER_HEAD, Rarity.RARE),
 	SUMSUNG_GG_ABICASE(Material.PLAYER_HEAD, Rarity.RARE),
+	CAMPFIRE_TALISMAN_1(Material.PLAYER_HEAD, Rarity.COMMON),
 
 	/**
 	 * Community Shop Items
@@ -582,6 +583,10 @@ public enum ItemType {
 	MINER_ARMOR_LEGGINGS(Material.IRON_LEGGINGS, Rarity.RARE),
 	MINER_ARMOR_BOOTS(Material.IRON_BOOTS, Rarity.RARE),
 
+	CHARLIE_TROUSERS(Material.LEATHER_LEGGINGS, Rarity.COMMON),
+	KELLY_TSHIRT(Material.LEATHER_CHESTPLATE, Rarity.COMMON),
+	MELODY_SHOES(Material.LEATHER_BOOTS, Rarity.COMMON),
+
 	/**
 	 * Pickaxes
 	 */
@@ -743,6 +748,8 @@ public enum ItemType {
 	HUB_DARK_AUCTION_TRAVEL_SCROLL(Material.MAP, Rarity.EPIC),
     HUB_CRYPTS_TRAVEL_SCROLL(Material.MAP, Rarity.EPIC),
 
+	FORAGING_1_TRAVEL_SCROLL(Material.MAP, Rarity.RARE),
+
 	/**
 	 * Crimson Isles
 	 */

configuration/skyblock/Minestom.regions.csv

@@ -86,7 +86,8 @@ barn_1,THE_BARN,82,26,-177,250,120,-334,THE_FARMING_ISLANDS
 birch_forest,BIRCH_PARK,-255,114,26,-336,41,-90,THE_PARK
 spruce_forest,SPRUCE_WOODS,-387,151,-22,-309,59,107,THE_PARK
 dark_thicket,DARK_THICKET,-333,148,-24,-415,59,-122,THE_PARK
-jungle,JUNGLE_ISLAND,-306,149,-130,-507,68,-18,THE_PARK
+trial_of_fire,TRIALS_OF_FIRE,-369,120,-100,-357,101,-88,THE_PARK
+jungle,JUNGLE_ISLAND,-417,149,-130,-507,68,-18,THE_PARK
 savanna,SAVANNA_WOODLAND,-467,155,-20,-383,56,102,THE_PARK
 sherry,SHERRYS_SHOWROOM,21,98,86,7,76,108,JERRYS_WORKSHOP
 jerry,JERRYS_WORKSHOP,139,183,200,-163,30,-167,JERRYS_WORKSHOP

configuration/skyblock/items/accessories/campfire.yml

@@ -0,0 +1,16 @@
+items:
+  - id: CAMPFIRE_TALISMAN_1
+    material: PLAYER_HEAD
+    rarity: COMMON
+    lore:
+      - "§7Heal §c4❤ §7 per second while burning"
+      - " "
+      - "§6Trial of Fire II"
+      - "§8§o\"Fire guy!\""
+    components:
+      - id: SKULL_HEAD
+        texture: 3ada666715bfd2aa9fbd81daef59b9fe1c96c4fa0d08dbc72eae5633177dbf88
+      - id: ACCESSORY
+      - id: DEFAULT_SOULBOUND
+      - id: CUSTOM_DISPLAY_NAME
+        name: "§fCampfire Initiate Badge I"

configuration/skyblock/items/armor/thepark.yml

@@ -0,0 +1,19 @@
+items:
+  - id: CHARLIE_TROUSERS
+    rarity: COMMON
+    default_statistics:
+      defense: 15
+      health: 45
+      foraging_fortune: 6
+    components:
+      - id: CUSTOM_DISPLAY_NAME
+        display_name: Charlie's Trousers
+      - id: STANDARD_ITEM
+        standard_item_type: HELMET
+      - id: LEATHER_COLOR
+        r: '20'
+        g: '121'
+        b: '100'
+      - id: TRACKED_UNIQUE
+      - id: MUSEUM
+        museum_category: ARMOR_SETS

configuration/skyblock/items/travelscroll.yml

@@ -35,6 +35,12 @@ items:
     components:
       - id: TRAVEL_SCROLL
         scroll_type: HUB_DARK_AUCTION
+  - id: FORAGING_1_TRAVEL_SCROLL
+    material: PAPER
+    rarity: RARE
+    components:
+      - id: TRAVEL_SCROLL
+        scroll_type: THE_PARK
   - id: HUB_CRYPTS_TRAVEL_SCROLL
     material: PAPER
     rarity: UNCOMMON

configuration/skyblock/items/vanilla/blocks/wood/birch.yml

@@ -22,6 +22,12 @@ items:
     material: BIRCH_WOOD
     rarity: COMMON
     components:
+      - id: CUSTOM_DROP
+        rules:
+          - drops:
+              - item: BIRCH_LOG
+                chance: 1
+                amount: 1
       - id: SELLABLE
         value: 2.0
       - id: PLACEABLE

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/GameWorldManager.java

@@ -150,7 +150,7 @@ public VillagerProfession profession() {
                         }
 
                         @Override
-                        public boolean looking() {
+                        public boolean looking(HypixelPlayer player) {
                             return true;
                         }
 
@@ -189,7 +189,7 @@ public VillagerProfession profession() {
                         }
 
                         @Override
-                        public boolean looking() {
+                        public boolean looking(HypixelPlayer player) {
                             return true;
                         }
 

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCDoormanDave.java

@@ -36,7 +36,7 @@ public Pos position(HypixelPlayer player) {
 			}
 
 			@Override
-			public boolean looking() {
+			public boolean looking(HypixelPlayer player) {
 				return true;
 			}
 		});

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCDoubles.java

@@ -63,7 +63,7 @@ public Pos position(HypixelPlayer player) {
 			}
 
 			@Override
-			public boolean looking() {
+			public boolean looking(HypixelPlayer player) {
 				return false;
 			}
 		});

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/npcs/NPCDream.java

@@ -62,7 +62,7 @@ public Pos position(HypixelPlayer player) {
 			}
 
 			@Override
-			public boolean looking() {
+			public boolean looking(HypixelPlayer player) {
 				return false;
 			}
 		});