Skip to content

Commit 1f9337e

Browse files
NextdoorPsychoNextdoorPsycho
authored
Merge pull request #500 from VolmitSoftware/Development
Update / Upmerge
2 parents 075ce09 + 3c59150 commit 1f9337e

File tree

7 files changed

+25
-249
lines changed

7 files changed

+25
-249
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ version '1.15.0-1.19.2-1.21'
2626
def apiVersion = '1.19'
2727
def name = getRootProject().getName() // Defined in settings.gradle
2828
def main = 'com.volmit.adapt.Adapt'
29-
def manifoldVersion = '2024.1.20'
29+
def manifoldVersion = '2024.1.10'
3030

3131
// ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED
3232
// ======================== WINDOWS =============================
@@ -39,7 +39,7 @@ registerCustomOutputTask('CrazyDev22', 'C://Users/Julian/Desktop/server/plugins'
3939
registerCustomOutputTask('Pixel', 'D://Iris Dimension Engine//1.20.4 - Development//plugins')
4040
// ========================== UNIX ==============================
4141
registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins')
42-
registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Developer/RemoteGit/Server/plugins', false)
42+
registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Developer/RemoteGit/Server/plugins')
4343
registerCustomOutputTaskUnix('the456gamer', '/home/the456gamer/projects/minecraft/adapt-testserver/plugins/update/', false)
4444
// ==============================================================
4545

‎src/main/java/com/volmit/adapt/content/skill/SkillNether.java‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818

1919
package com.volmit.adapt.content.skill;
2020

21-
import com.fren_gor.ultimateAdvancementAPI.advancement.display.AdvancementFrameType;
22-
import com.volmit.adapt.api.advancement.AdaptAdvancement;
23-
import com.volmit.adapt.api.advancement.AdvancementVisibility;
2421
import com.volmit.adapt.api.skill.SimpleSkill;
25-
import com.volmit.adapt.api.world.AdaptStatTracker;
2622
import com.volmit.adapt.content.adaptation.nether.NetherFireResist;
2723
import com.volmit.adapt.content.adaptation.nether.NetherSkullYeet;
2824
import com.volmit.adapt.content.adaptation.nether.NetherWitherResist;
@@ -55,42 +51,6 @@ public SkillNether() {
5551
registerAdaptation(new NetherWitherResist());
5652
registerAdaptation(new NetherSkullYeet());
5753
registerAdaptation(new NetherFireResist());
58-
registerAdvancement(AdaptAdvancement.builder()
59-
.icon(Material.WITHER_SKELETON_SKULL)
60-
.key("challenge_wither_skeleton_kill_1k")
61-
.title(Localizer.dLocalize("advancement", "challenge_wither_skeleton_kill_1k", "title"))
62-
.description(Localizer.dLocalize("advancement", "challenge_wither_skeleton_kill_1k", "description"))
63-
.frame(AdvancementFrameType.CHALLENGE)
64-
.visibility(AdvancementVisibility.PARENT_GRANTED)
65-
.child(AdaptAdvancement.builder()
66-
.icon(Material.WITHER_SKELETON_SKULL)
67-
.key("challenge_wither_skeleton_kill_5k")
68-
.title(Localizer.dLocalize("advancement", "challenge_wither_skeleton_kill_5k", "title"))
69-
.description(Localizer.dLocalize("advancement", "challenge_wither_skeleton_kill_5k", "description"))
70-
.frame(AdvancementFrameType.CHALLENGE)
71-
.visibility(AdvancementVisibility.PARENT_GRANTED)
72-
.child(AdaptAdvancement.builder()
73-
.icon(Material.WITHER_SKELETON_SKULL)
74-
.key("challenge_wither_skeleton_kill_50k")
75-
.title(Localizer.dLocalize("advancement", "challenge_wither_skeleton_kill_50k", "title"))
76-
.description(Localizer.dLocalize("advancement", "challenge_wither_skeleton_kill_50k", "description"))
77-
.frame(AdvancementFrameType.CHALLENGE)
78-
.visibility(AdvancementVisibility.PARENT_GRANTED)
79-
.child(AdaptAdvancement.builder()
80-
.icon(Material.WITHER_SKELETON_SKULL)
81-
.key("challenge_wither_skeleton_kill_500k")
82-
.title(Localizer.dLocalize("advancement", "challenge_wither_skeleton_kill_500k", "title"))
83-
.description(Localizer.dLocalize("advancement", "challenge_wither_skeleton_kill_500k", "description"))
84-
.frame(AdvancementFrameType.CHALLENGE)
85-
.visibility(AdvancementVisibility.PARENT_GRANTED)
86-
.build())
87-
.build())
88-
.build())
89-
.build());
90-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_wither_skeleton_kill_1k").goal(1000).stat("wither_skeleton_kills").reward(getConfig().getWitherSkeletonKillXp()).build());
91-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_wither_skeleton_kill_5k").goal(5000).stat("wither_skeleton_kills").reward(getConfig().getWitherSkeletonKillXp()).build());
92-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_wither_skeleton_kill_50k").goal(50000).stat("wither_skeleton_kills").reward(getConfig().getWitherSkeletonKillXp()).build());
93-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_wither_skeleton_kill_500k").goal(500000).stat("wither_skeleton_kills").reward(getConfig().getWitherSkeletonKillXp()).build());
9454
}
9555

9656
private boolean shouldReturnForEventWithCause(Player p, EntityDamageEvent.DamageCause cause) {

‎src/main/java/com/volmit/adapt/content/skill/SkillRanged.java‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818

1919
package com.volmit.adapt.content.skill;
2020

21-
import com.fren_gor.ultimateAdvancementAPI.advancement.display.AdvancementFrameType;
22-
import com.volmit.adapt.api.advancement.AdaptAdvancement;
23-
import com.volmit.adapt.api.advancement.AdvancementVisibility;
2421
import com.volmit.adapt.api.skill.SimpleSkill;
25-
import com.volmit.adapt.api.world.AdaptStatTracker;
2622
import com.volmit.adapt.content.adaptation.ranged.*;
2723
import com.volmit.adapt.util.C;
2824
import com.volmit.adapt.util.Localizer;
@@ -58,44 +54,6 @@ public SkillRanged() {
5854
registerAdaptation(new RangedWebBomb());
5955
setIcon(Material.CROSSBOW);
6056
cooldowns = new HashMap<>();
61-
62-
registerAdvancement(AdaptAdvancement.builder()
63-
.icon(Material.BOW)
64-
.key("challenge_ranged_1k")
65-
.title(Localizer.dLocalize("advancement", "challenge_ranged_1k", "title"))
66-
.description(Localizer.dLocalize("advancement", "challenge_ranged_1k", "description"))
67-
.frame(AdvancementFrameType.CHALLENGE)
68-
.visibility(AdvancementVisibility.PARENT_GRANTED)
69-
.child(AdaptAdvancement.builder()
70-
.icon(Material.CROSSBOW)
71-
.key("challenge_ranged_5k")
72-
.title(Localizer.dLocalize("advancement", "challenge_ranged_5k", "title"))
73-
.description(Localizer.dLocalize("advancement", "challenge_ranged_5k", "description"))
74-
.frame(AdvancementFrameType.CHALLENGE)
75-
.visibility(AdvancementVisibility.PARENT_GRANTED)
76-
.child(AdaptAdvancement.builder()
77-
.icon(Material.TIPPED_ARROW)
78-
.key("challenge_ranged_50k")
79-
.title(Localizer.dLocalize("advancement", "challenge_ranged_50k", "title"))
80-
.description(Localizer.dLocalize("advancement", "challenge_ranged_50k", "description"))
81-
.frame(AdvancementFrameType.CHALLENGE)
82-
.visibility(AdvancementVisibility.PARENT_GRANTED)
83-
.child(AdaptAdvancement.builder()
84-
.icon(Material.SPECTRAL_ARROW)
85-
.key("challenge_ranged_500k")
86-
.title(Localizer.dLocalize("advancement", "challenge_ranged_500k", "title"))
87-
.description(Localizer.dLocalize("advancement", "challenge_ranged_500k", "description"))
88-
.frame(AdvancementFrameType.CHALLENGE)
89-
.visibility(AdvancementVisibility.PARENT_GRANTED)
90-
.build())
91-
.build())
92-
.build())
93-
.build());
94-
95-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_ranged_1k").goal(1000).stat("ranged.shotsfired").reward(getConfig().challengeRanged1kReward).build());
96-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_ranged_5k").goal(5000).stat("ranged.shotsfired").reward(getConfig().challengeRanged5kReward).build());
97-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_ranged_50k").goal(50000).stat("ranged.shotsfired").reward(getConfig().challengeRanged50kReward).build());
98-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_ranged_500k").goal(500000).stat("ranged.shotsfired").reward(getConfig().challengeRanged500kReward).build());
9957
}
10058

10159
@EventHandler(priority = EventPriority.MONITOR)
@@ -166,9 +124,5 @@ protected static class Config {
166124
long cooldownDelay = 1250;
167125
double hitDamageXPMultiplier = 2.125;
168126
double hitDistanceXPMultiplier = 1.7;
169-
double challengeRanged1kReward = 1000;
170-
double challengeRanged5kReward = 5000;
171-
double challengeRanged50kReward = 50000;
172-
double challengeRanged500kReward = 500000;
173127
}
174128
}

‎src/main/java/com/volmit/adapt/content/skill/SkillRift.java‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818

1919
package com.volmit.adapt.content.skill;
2020

21-
import com.fren_gor.ultimateAdvancementAPI.advancement.display.AdvancementFrameType;
22-
import com.volmit.adapt.api.advancement.AdaptAdvancement;
23-
import com.volmit.adapt.api.advancement.AdvancementVisibility;
2421
import com.volmit.adapt.api.skill.SimpleSkill;
25-
import com.volmit.adapt.api.world.AdaptStatTracker;
2622
import com.volmit.adapt.content.adaptation.rift.*;
2723
import com.volmit.adapt.util.C;
2824
import com.volmit.adapt.util.Localizer;
@@ -60,44 +56,6 @@ public SkillRift() {
6056
registerAdaptation(new RiftBlink());
6157
registerAdaptation(new RiftDescent());
6258
lasttp = new HashMap<>();
63-
64-
registerAdvancement(AdaptAdvancement.builder()
65-
.icon(Material.ENDER_EYE)
66-
.key("challenge_rift_1k")
67-
.title(Localizer.dLocalize("advancement", "challenge_rift_1k", "title"))
68-
.description(Localizer.dLocalize("advancement", "challenge_rift_1k", "description"))
69-
.frame(AdvancementFrameType.CHALLENGE)
70-
.visibility(AdvancementVisibility.PARENT_GRANTED)
71-
.child(AdaptAdvancement.builder()
72-
.icon(Material.ENDER_PEARL)
73-
.key("challenge_rift_5k")
74-
.title(Localizer.dLocalize("advancement", "challenge_rift_5k", "title"))
75-
.description(Localizer.dLocalize("advancement", "challenge_rift_5k", "description"))
76-
.frame(AdvancementFrameType.CHALLENGE)
77-
.visibility(AdvancementVisibility.PARENT_GRANTED)
78-
.child(AdaptAdvancement.builder()
79-
.icon(Material.END_CRYSTAL)
80-
.key("challenge_rift_50k")
81-
.title(Localizer.dLocalize("advancement", "challenge_rift_50k", "title"))
82-
.description(Localizer.dLocalize("advancement", "challenge_rift_50k", "description"))
83-
.frame(AdvancementFrameType.CHALLENGE)
84-
.visibility(AdvancementVisibility.PARENT_GRANTED)
85-
.child(AdaptAdvancement.builder()
86-
.icon(Material.END_PORTAL_FRAME)
87-
.key("challenge_rift_500k")
88-
.title(Localizer.dLocalize("advancement", "challenge_rift_500k", "title"))
89-
.description(Localizer.dLocalize("advancement", "challenge_rift_500k", "description"))
90-
.frame(AdvancementFrameType.CHALLENGE)
91-
.visibility(AdvancementVisibility.PARENT_GRANTED)
92-
.build())
93-
.build())
94-
.build())
95-
.build());
96-
97-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_rift_1k").goal(1000).stat("rift.teleports").reward(getConfig().challengeRift1kReward).build());
98-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_rift_5k").goal(5000).stat("rift.teleports").reward(getConfig().challengeRift5kReward).build());
99-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_rift_50k").goal(50000).stat("rift.teleports").reward(getConfig().challengeRift50kReward).build());
100-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_rift_500k").goal(500000).stat("rift.teleports").reward(getConfig().challengeRift500kReward).build());
10159
}
10260

10361
@EventHandler(priority = EventPriority.MONITOR)
@@ -201,9 +159,5 @@ protected static class Config {
201159
double throwEnderEyeXP = 45;
202160
double teleportXP = 15;
203161
double teleportXPCooldown = 60000;
204-
double challengeRift1kReward = 1000;
205-
double challengeRift5kReward = 5000;
206-
double challengeRift50kReward = 50000;
207-
double challengeRift500kReward = 500000;
208162
}
209163
}

‎src/main/java/com/volmit/adapt/content/skill/SkillSeaborne.java‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -60,39 +60,12 @@ public SkillSeaborne() {
6060
registerAdvancement(AdaptAdvancement.builder()
6161
.icon(Material.TURTLE_HELMET)
6262
.key("challenge_swim_1nm")
63-
.title(Localizer.dLocalize("advancement", "challenge_swim_1nm", "title"))
64-
.description(Localizer.dLocalize("advancement", "challenge_swim_1nm", "description"))
63+
.title("Human Submarine!")
64+
.description("Swim 1 Nautical Mile (1,852 blocks)")
6565
.frame(AdvancementFrameType.CHALLENGE)
6666
.visibility(AdvancementVisibility.PARENT_GRANTED)
67-
.child(AdaptAdvancement.builder()
68-
.icon(Material.HEART_OF_THE_SEA)
69-
.key("challenge_swim_5nm")
70-
.title(Localizer.dLocalize("advancement", "challenge_swim_5nm", "title"))
71-
.description(Localizer.dLocalize("advancement", "challenge_swim_5nm", "description"))
72-
.frame(AdvancementFrameType.CHALLENGE)
73-
.visibility(AdvancementVisibility.PARENT_GRANTED)
74-
.child(AdaptAdvancement.builder()
75-
.icon(Material.NAUTILUS_SHELL)
76-
.key("challenge_swim_50nm")
77-
.title(Localizer.dLocalize("advancement", "challenge_swim_50nm", "title"))
78-
.description(Localizer.dLocalize("advancement", "challenge_swim_50nm", "description"))
79-
.frame(AdvancementFrameType.CHALLENGE)
80-
.visibility(AdvancementVisibility.PARENT_GRANTED)
81-
.child(AdaptAdvancement.builder()
82-
.icon(Material.CONDUIT)
83-
.key("challenge_swim_500nm")
84-
.title(Localizer.dLocalize("advancement", "challenge_swim_500nm", "title"))
85-
.description(Localizer.dLocalize("advancement", "challenge_swim_500nm", "description"))
86-
.frame(AdvancementFrameType.CHALLENGE)
87-
.visibility(AdvancementVisibility.PARENT_GRANTED)
88-
.build())
89-
.build())
90-
.build())
9167
.build());
9268
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_swim_1nm").goal(1852).stat("move.swim").reward(getConfig().challengeSwim1nmReward).build());
93-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_swim_5nm").goal(9260).stat("move.swim").reward(getConfig().challengeSwim5nmReward).build());
94-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_swim_50nm").goal(92600).stat("move.swim").reward(getConfig().challengeSwim50nmReward).build());
95-
registerStatTracker(AdaptStatTracker.builder().advancement("challenge_swim_500nm").goal(926000).stat("move.swim").reward(getConfig().challengeSwim500nmReward).build());
9669
cooldowns = new HashMap<>();
9770
}
9871

@@ -190,9 +163,6 @@ protected static class Config {
190163
double damagedrownxpmultiplier = 3;
191164
boolean enabled = true;
192165
double challengeSwim1nmReward = 750;
193-
double challengeSwim5nmReward = 1500;
194-
double challengeSwim50nmReward = 7500;
195-
double challengeSwim500nmReward = 15000;
196166
double swimXP = 28.7;
197167
}
198168
}

‎src/main/resources/en_US.json‎

Lines changed: 1 addition & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -231,71 +231,8 @@
231231
"challenge_pickaxe_5m": {
232232
"title": "Legendary Miner",
233233
"description": "Break 5,000,000 Blocks"
234-
},
235-
"challenge_wither_skeleton_kill_1k": {
236-
"title": "Wither Skeleton Slayer",
237-
"description": "You really dont like these guys do you?"
238-
},
239-
"challenge_wither_skeleton_kill_5k": {
240-
"title": "Wither Skeleton Hunter",
241-
"description": "Ok, you really dont like these guys are you done?"
242-
},
243-
"challenge_wither_skeleton_kill_50k": {
244-
"title": "Wither Skeleton Conqueror",
245-
"description": "Stop killing these guys, they have families!"
246-
},
247-
"challenge_wither_skeleton_kill_500k": {
248-
"title": "Wither Skeleton Annihilator",
249-
"description": "What on gods earth made you kill this many..."
250-
},
251-
"challenge_ranged_1k": {
252-
"title": "Novice Archer",
253-
"description": "Fire 1,000 Shots"
254-
},
255-
"challenge_ranged_5k": {
256-
"title": "Skilled Archer",
257-
"description": "Fire 5,000 Shots"
258-
},
259-
"challenge_ranged_50k": {
260-
"title": "Expert Archer",
261-
"description": "Fire 50,000 Shots"
262-
},
263-
"challenge_ranged_500k": {
264-
"title": "Master Archer",
265-
"description": "Fire 500,000 Shots"
266-
},
267-
"challenge_rift_1k": {
268-
"title": "Novice V'Woop-er",
269-
"description": "Teleport 1,000 Times"
270-
},
271-
"challenge_rift_5k": {
272-
"title": "Skilled Portal Jumper",
273-
"description": "Teleport 5,000 Times"
274-
},
275-
"challenge_rift_50k": {
276-
"title": "Expert Teleporter",
277-
"description": "Teleport 50,000 Times"
278-
},
279-
"challenge_rift_500k": {
280-
"title": "Master Ender-person (Teleporter)",
281-
"description": "Teleport 500,000 Times, Woah..."
282-
},
283-
"challenge_swim_1nm": {
284-
"title": "Novice Swimmer",
285-
"description": "Swim 1 Nautical Mile (1,852 blocks)"
286-
},
287-
"challenge_swim_5nm": {
288-
"title": "Skilled Swimmer",
289-
"description": "Swim 5 Nautical Miles (9,260 blocks)"
290-
},
291-
"challenge_swim_50nm": {
292-
"title": "Expert Swimmer",
293-
"description": "Swim 50 Nautical Miles (92,600 blocks)"
294-
},
295-
"challenge_swim_500nm": {
296-
"title": "Master Swimmer",
297-
"description": "Swim 500 Nautical Miles (926,000 blocks)"
298234
}
235+
299236
},
300237
"items": {
301238
"boundenderperal": {

0 commit comments

Comments
 (0)