From c22b941af229411a9a36b08d068a493697abbc98 Mon Sep 17 00:00:00 2001 From: limited_dev Date: Fri, 20 Jan 2023 23:11:23 +0100 Subject: [PATCH] feat: added CiRunner, added stuff to build.gradle.kts, added two maps to MapManager --- .gitlab-ci.yml | 32 ++++++++ Weapons/52_gal.judd | 10 --- Weapons/96_gal.judd | 10 --- Weapons/ballpoint_splatling.judd | 10 --- Weapons/bamboozler14mki.judd | 10 --- Weapons/blaster.judd | 10 --- Weapons/carbon_roller.judd | 10 --- Weapons/clash_blaster.judd | 10 --- Weapons/classic_squiffer.judd | 10 --- Weapons/dapple_dualies.judd | 10 --- Weapons/dark_tetra_dualies.judd | 10 --- Weapons/dualie_squelchers.judd | 10 --- Weapons/dynamo_roller.judd | 10 --- Weapons/e_liter_4k.judd | 10 --- Weapons/e_liter_4k_scope.judd | 10 --- Weapons/explosher.judd | 10 --- Weapons/flingza_roller.judd | 10 --- Weapons/glooga_dualies.judd | 10 --- Weapons/goo_tuber.judd | 10 --- Weapons/h_3_nozzlenose.judd | 10 --- Weapons/heavy_Splatling.judd | 10 --- Weapons/hero_shot_replica.judd | 10 --- Weapons/hurensohn.judd | 10 --- Weapons/hydra_splatling.judd | 10 --- Weapons/inkbrush.judd | 10 --- Weapons/jet_squelcher.judd | 10 --- Weapons/l_3_nozzlenose.judd | 10 --- Weapons/luna_blaster.judd | 10 --- Weapons/mini_splatling.judd | 10 --- Weapons/n_zap_85.judd | 10 --- Weapons/nautilus_47.judd | 10 --- Weapons/octobrush.judd | 10 --- Weapons/piss_schwapper.judd | 10 --- Weapons/range_blaster.judd | 10 --- Weapons/rapid_blaster.judd | 10 --- Weapons/rapid_blaster_pro.judd | 10 --- Weapons/slosher.judd | 10 --- Weapons/splash_o_matic.judd | 10 --- Weapons/splat_brella.judd | 10 --- Weapons/splat_charger.judd | 10 --- Weapons/splat_dualies.judd | 10 --- Weapons/splat_roller.judd | 10 --- Weapons/splatana_stamper.judd | 10 --- Weapons/splatana_wiper.judd | 10 --- Weapons/splatterscope.judd | 10 --- Weapons/splattershot.judd | 10 --- Weapons/splattershot_jr.judd | 10 --- Weapons/splattershot_pro.judd | 10 --- Weapons/sploosh_o_matic.judd | 10 --- Weapons/squeezer.judd | 10 --- Weapons/tenta_brella.judd | 10 --- Weapons/trashcan.judd | 10 --- Weapons/tri_slosher.judd | 10 --- Weapons/tri_stringer.judd | 10 --- Weapons/undercover_brella.judd | 10 --- Weapons/version.info | 2 - Weapons/waschmaschiene.judd | 10 --- build.gradle.kts | 73 ++++++++++++++++++- .../lil_judd/features/maps/MapManager.java | 2 + 59 files changed, 103 insertions(+), 556 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 Weapons/52_gal.judd delete mode 100644 Weapons/96_gal.judd delete mode 100644 Weapons/ballpoint_splatling.judd delete mode 100644 Weapons/bamboozler14mki.judd delete mode 100644 Weapons/blaster.judd delete mode 100644 Weapons/carbon_roller.judd delete mode 100644 Weapons/clash_blaster.judd delete mode 100644 Weapons/classic_squiffer.judd delete mode 100644 Weapons/dapple_dualies.judd delete mode 100644 Weapons/dark_tetra_dualies.judd delete mode 100644 Weapons/dualie_squelchers.judd delete mode 100644 Weapons/dynamo_roller.judd delete mode 100644 Weapons/e_liter_4k.judd delete mode 100644 Weapons/e_liter_4k_scope.judd delete mode 100644 Weapons/explosher.judd delete mode 100644 Weapons/flingza_roller.judd delete mode 100644 Weapons/glooga_dualies.judd delete mode 100644 Weapons/goo_tuber.judd delete mode 100644 Weapons/h_3_nozzlenose.judd delete mode 100644 Weapons/heavy_Splatling.judd delete mode 100644 Weapons/hero_shot_replica.judd delete mode 100644 Weapons/hurensohn.judd delete mode 100644 Weapons/hydra_splatling.judd delete mode 100644 Weapons/inkbrush.judd delete mode 100644 Weapons/jet_squelcher.judd delete mode 100644 Weapons/l_3_nozzlenose.judd delete mode 100644 Weapons/luna_blaster.judd delete mode 100644 Weapons/mini_splatling.judd delete mode 100644 Weapons/n_zap_85.judd delete mode 100644 Weapons/nautilus_47.judd delete mode 100644 Weapons/octobrush.judd delete mode 100644 Weapons/piss_schwapper.judd delete mode 100644 Weapons/range_blaster.judd delete mode 100644 Weapons/rapid_blaster.judd delete mode 100644 Weapons/rapid_blaster_pro.judd delete mode 100644 Weapons/slosher.judd delete mode 100644 Weapons/splash_o_matic.judd delete mode 100644 Weapons/splat_brella.judd delete mode 100644 Weapons/splat_charger.judd delete mode 100644 Weapons/splat_dualies.judd delete mode 100644 Weapons/splat_roller.judd delete mode 100644 Weapons/splatana_stamper.judd delete mode 100644 Weapons/splatana_wiper.judd delete mode 100644 Weapons/splatterscope.judd delete mode 100644 Weapons/splattershot.judd delete mode 100644 Weapons/splattershot_jr.judd delete mode 100644 Weapons/splattershot_pro.judd delete mode 100644 Weapons/sploosh_o_matic.judd delete mode 100644 Weapons/squeezer.judd delete mode 100644 Weapons/tenta_brella.judd delete mode 100644 Weapons/trashcan.judd delete mode 100644 Weapons/tri_slosher.judd delete mode 100644 Weapons/tri_stringer.judd delete mode 100644 Weapons/undercover_brella.judd delete mode 100644 Weapons/version.info delete mode 100644 Weapons/waschmaschiene.judd diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ca63640 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,32 @@ +image: gradle + +stages: + - build + - publish + +variables: + GRADLE_OPTS: "-Dorg.gradle.daemon=false" + GIT_SUBMODULE_STRATEGY: recursive + +before_script: + - export GRADLE_USER_HOME=`pwd`/.gradle + - rm -f .gradle/caches/modules-2/modules-2.lock + - rm -fr .gradle/caches/*/plugin-resolution/ + +cache: + paths: + - .gradle/wrapper + - .gradle/caches + - build + +build: + stage: build + script: + - gradle shadowJar + except: + - tags + +publish: + stage: publish + script: + - gradle publish diff --git a/Weapons/52_gal.judd b/Weapons/52_gal.judd deleted file mode 100644 index 3418d1a..0000000 --- a/Weapons/52_gal.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameDE=.52 Gallon -nameEN=.52 Gal -callout=52 -requiredLvl=11 -pointsForSpecial=200 -mainType=shooter -subType=splash wall -specialType=killer wail 5.1 -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/e/ed/S3_Weapon_Main_.52_Gal.png diff --git a/Weapons/96_gal.judd b/Weapons/96_gal.judd deleted file mode 100644 index 43b7959..0000000 --- a/Weapons/96_gal.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameDE=.96 Gallon -nameEN=.96 Gal -callout=96 -requiredLvl=17 -pointsForSpecial=200 -mainType=shooter -subType=Sprinkler -specialType=ink vac -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/5/55/S3_Weapon_Main_.96_Gal.png diff --git a/Weapons/ballpoint_splatling.judd b/Weapons/ballpoint_splatling.judd deleted file mode 100644 index acff820..0000000 --- a/Weapons/ballpoint_splatling.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Ballpoint Splatling -nameDE=Kuli-Splatling -callout=Ballpoint ? -requiredLvl=30 -pointsForSpecial=200 -mainType=splatling -subType=fizzy bomb -specialType=inkjet -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/f/f9/S3_Weapon_Main_Ballpoint_Splatling.png diff --git a/Weapons/bamboozler14mki.judd b/Weapons/bamboozler14mki.judd deleted file mode 100644 index d648453..0000000 --- a/Weapons/bamboozler14mki.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Bamboozler 14 Mk I -nameDE=Klotzer 14-A -callout=Bamboo -requiredLvl=23 -pointsForSpecial=200 -mainType=charger -subType=autobomb -specialType=killer wail 5.1 -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/6/6d/S3_Weapon_Main_Bamboozler_14_Mk_I.png diff --git a/Weapons/blaster.judd b/Weapons/blaster.judd deleted file mode 100644 index 224bf1f..0000000 --- a/Weapons/blaster.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Blaster -nameDE=Blaster -callout=Blaster -requiredLvl=3 -pointsForSpecial=180 -mainType=blaster -subType=autobomb -specialType=big bubbler -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/a/a7/S3_Weapon_Main_Blaster.png diff --git a/Weapons/carbon_roller.judd b/Weapons/carbon_roller.judd deleted file mode 100644 index 0c22dab..0000000 --- a/Weapons/carbon_roller.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Carbon Roller -nameDE=Karbonroller -callout=Carbon -requiredLvl=6 -pointsForSpecial=180 -mainType=roller -subType=autobomb -specialType=zipcaster -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/2/21/S3_Weapon_Main_Carbon_Roller.png diff --git a/Weapons/clash_blaster.judd b/Weapons/clash_blaster.judd deleted file mode 100644 index a79120e..0000000 --- a/Weapons/clash_blaster.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Clash Blaster -nameDE=Kontra-Blaster -callout=Clash -requiredLvl=22 -pointsForSpecial=180 -mainType=blaster -subType=splat bomb -specialType=trizooka -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/2/2f/S3_Weapon_Main_Clash_Blaster.png diff --git a/Weapons/classic_squiffer.judd b/Weapons/classic_squiffer.judd deleted file mode 100644 index 1d6933c..0000000 --- a/Weapons/classic_squiffer.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Classic Squiffer -nameDE=Sepiator α -callout=Squiffer -requiredLvl=8 -pointsForSpecial=190 -mainType=Charger -subType=point sensor -specialType=big bubbler -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/3/3c/S3_Weapon_Main_Classic_Squiffer.png diff --git a/Weapons/dapple_dualies.judd b/Weapons/dapple_dualies.judd deleted file mode 100644 index 7b0dc1b..0000000 --- a/Weapons/dapple_dualies.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Dapple Dualies -nameDE=Sprenkler -callout=Dapples -requiredLvl=14 -pointsForSpecial=180 -mainType=dualie -subType=squid beakon -specialType=Tacticooler -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/5/54/S3_Weapon_Main_Dapple_Dualies.png diff --git a/Weapons/dark_tetra_dualies.judd b/Weapons/dark_tetra_dualies.judd deleted file mode 100644 index 6960bea..0000000 --- a/Weapons/dark_tetra_dualies.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Dark Tetra Dualies -nameDE=Quadhopper Noir -callout=Tetras -requiredLvl=17 -pointsForSpecial=200 -mainType=dualie -subType=autobomb -specialType=reefslider -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/c/c9/S3_Weapon_Main_Dark_Tetra_Dualies.png diff --git a/Weapons/dualie_squelchers.judd b/Weapons/dualie_squelchers.judd deleted file mode 100644 index 98c4bc3..0000000 --- a/Weapons/dualie_squelchers.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Dualie Squelchers -nameDE=Dual-Platscher -callout=DS -requiredLvl=8 -pointsForSpecial=200 -mainType=dualie -subType=splat bomb -specialType=wave breaker -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/5/5a/S3_Weapon_Main_Dualie_Squelchers.png diff --git a/Weapons/dynamo_roller.judd b/Weapons/dynamo_roller.judd deleted file mode 100644 index dd6c274..0000000 --- a/Weapons/dynamo_roller.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Dynamo Roller -nameDE=Dynaroller -callout=Dynamo -requiredLvl=12 -pointsForSpecial=190 -mainType=roller -subType=sprinkler -specialType=tacticooler -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/5/5e/S3_Weapon_Main_Dynamo_Roller.png diff --git a/Weapons/e_liter_4k.judd b/Weapons/e_liter_4k.judd deleted file mode 100644 index 5efbc31..0000000 --- a/Weapons/e_liter_4k.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=E-liter 4K -nameDE=E-liter 4k -callout=E-Liter -requiredLvl=18 -pointsForSpecial=200 -mainType=charger -subType=ink mine -specialType=wave breaker -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/1/10/S3_Weapon_Main_E-liter_4K.png diff --git a/Weapons/e_liter_4k_scope.judd b/Weapons/e_liter_4k_scope.judd deleted file mode 100644 index e7a5c9f..0000000 --- a/Weapons/e_liter_4k_scope.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=E-liter 4K Scope -nameDE=Ziel-E-liter 4k -callout=E-Liter -requiredLvl=18 -pointsForSpecial=200 -mainType=charger -subType=ink mine -specialType=wave breaker -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/e/eb/S3_Weapon_Main_E-liter_4K_Scope.png diff --git a/Weapons/explosher.judd b/Weapons/explosher.judd deleted file mode 100644 index 0b03ac2..0000000 --- a/Weapons/explosher.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Explosher -nameDE=Knall-Schwapper -callout=Explo -requiredLvl=29 -pointsForSpecial=200 -mainType=slosher -subType=point sensor -specialType=ink storm -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/d/de/S3_Weapon_Main_Explosher.png diff --git a/Weapons/flingza_roller.judd b/Weapons/flingza_roller.judd deleted file mode 100644 index e1c8914..0000000 --- a/Weapons/flingza_roller.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Flingza Roller -nameDE=Flex-Roller -callout=Flingza -requiredLvl=20 -pointsForSpecial=210 -mainType=roller -subType=ink mine -specialType=tenta missiles -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/d/d2/S3_Weapon_Main_Flingza_Roller.png diff --git a/Weapons/glooga_dualies.judd b/Weapons/glooga_dualies.judd deleted file mode 100644 index b74840f..0000000 --- a/Weapons/glooga_dualies.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Glooga Dualies -nameDE=Kelvin 525 -callout=Gloogas -requiredLvl=21 -pointsForSpecial=180 -mainType=dualie -subType=splash wall -specialType=booyah bomb -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/9/99/S3_Weapon_Main_Glooga_Dualies.png diff --git a/Weapons/goo_tuber.judd b/Weapons/goo_tuber.judd deleted file mode 100644 index 3a154ac..0000000 --- a/Weapons/goo_tuber.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Goo Tuber -nameDE=T-Tuber -callout=Goo -requiredLvl=25 -pointsForSpecial=210 -mainType=charger -subType=torpedo -specialType=tenta missiles -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/8/8a/S3_Weapon_Main_Goo_Tuber.png diff --git a/Weapons/h_3_nozzlenose.judd b/Weapons/h_3_nozzlenose.judd deleted file mode 100644 index b4b1127..0000000 --- a/Weapons/h_3_nozzlenose.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=H-3 Nozzlenose -nameDE=S3 Tintenwerfer -callout=Nozzle -requiredLvl=24 -pointsForSpecial=200 -mainType=shooter -subType=point sensor -specialType=tacticooler -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/5/5a/S3_Weapon_Main_H-3_Nozzlenose.png diff --git a/Weapons/heavy_Splatling.judd b/Weapons/heavy_Splatling.judd deleted file mode 100644 index c126c35..0000000 --- a/Weapons/heavy_Splatling.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Heavy Splatling -nameDE=Splatling -callout=Heavy -requiredLvl=4 -pointsForSpecial=200 -mainType=splatling -subType=sprinkler -specialType=wave breaker -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/5/5e/S3_Weapon_Main_Heavy_Splatling.png diff --git a/Weapons/hero_shot_replica.judd b/Weapons/hero_shot_replica.judd deleted file mode 100644 index e7b2796..0000000 --- a/Weapons/hero_shot_replica.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Hero Shot Replica -nameDE=Heldenwaffe Replik -callout=Hero Shot -requiredLvl=1 -pointsForSpecial=200 -mainType=shooter -subType=suction bomb -specialType=trizooka -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/2/24/S3_Weapon_Main_Hero_Shot_Replica.png diff --git a/Weapons/hurensohn.judd b/Weapons/hurensohn.judd deleted file mode 100644 index 905eec6..0000000 --- a/Weapons/hurensohn.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=REEF-LUX 450 -nameDE=LACT-450 -callout=REEF LUX -requiredLvl=10 -pointsForSpecial=210 -mainType=stringer -subType=curling bomb -specialType=tenta missiles -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/6/66/S3_Weapon_Main_REEF-LUX_450.png diff --git a/Weapons/hydra_splatling.judd b/Weapons/hydra_splatling.judd deleted file mode 100644 index 0c972e1..0000000 --- a/Weapons/hydra_splatling.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Hydra Splatling -nameDE=Hydrant -callout=Hydra -requiredLvl=20 -pointsForSpecial=190 -mainType=splatling -subType=autobomb -specialType=booyah bomb -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/d/d1/S3_Weapon_Main_Hydra_Splatling.png diff --git a/Weapons/inkbrush.judd b/Weapons/inkbrush.judd deleted file mode 100644 index 07516c9..0000000 --- a/Weapons/inkbrush.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Inkbrush -nameDE=Quasto -callout=Brush -requiredLvl=7 -pointsForSpecial=180 -mainType=brush -subType=splat bomb -specialType=killer wail 5.1 -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/4/4a/S3_Weapon_Main_Inkbrush.png diff --git a/Weapons/jet_squelcher.judd b/Weapons/jet_squelcher.judd deleted file mode 100644 index f3f2f62..0000000 --- a/Weapons/jet_squelcher.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Jet Squelcher -nameDE=Platcher -callout=Squelcher -requiredLvl=15 -pointsForSpecial=200 -mainType=shooter -subType=angle shooter -specialType=ink vac -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/6/69/S3_Weapon_Main_Jet_Squelcher.png diff --git a/Weapons/l_3_nozzlenose.judd b/Weapons/l_3_nozzlenose.judd deleted file mode 100644 index 04ddd31..0000000 --- a/Weapons/l_3_nozzlenose.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=L-3 Nozzlenose -nameDE=L3 Tintenwerfer -callout=Nozzle -requiredLvl=13 -pointsForSpecial=200 -mainType=shooter -subType=curling bomb -specialType=crab tank -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/2/2c/S3_Weapon_Main_L-3_Nozzlenose.png diff --git a/Weapons/luna_blaster.judd b/Weapons/luna_blaster.judd deleted file mode 100644 index 5191c3d..0000000 --- a/Weapons/luna_blaster.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Luna Blaster -nameDE=Luna-Blaster -callout=Luna -requiredLvl=13 -pointsForSpecial=180 -mainType=blaster -subType=splat bomb -specialType=zipcaster -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/5/59/S3_Weapon_Main_Luna_Blaster.png diff --git a/Weapons/mini_splatling.judd b/Weapons/mini_splatling.judd deleted file mode 100644 index 6845357..0000000 --- a/Weapons/mini_splatling.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Aerospray MG -nameDE=Airbrush MG -callout=Trashcan -requiredLvl=5 -pointsForSpecial=200 -mainType=shooter -subType=curling bomb -specialType=crab tank -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/8/86/S3_Weapon_Main_Mini_Splatling.png diff --git a/Weapons/n_zap_85.judd b/Weapons/n_zap_85.judd deleted file mode 100644 index 59018b7..0000000 --- a/Weapons/n_zap_85.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=N-ZAP '85 -nameDE=N-ZAP85 -callout=ZAP -requiredLvl=6 -pointsForSpecial=200 -mainType=shooter -subType=suction bomb -specialType=tacticooler -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/f/f6/S3_Weapon_Main_N-ZAP_%2785.png diff --git a/Weapons/nautilus_47.judd b/Weapons/nautilus_47.judd deleted file mode 100644 index fa602b3..0000000 --- a/Weapons/nautilus_47.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Nautilus 47 -nameDE=Nautilus 47 -callout=Naut -requiredLvl=28 -pointsForSpecial=190 -mainType=splatling -subType=point sensor -specialType=ink storm -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/8/81/S3_Weapon_Main_Nautilus_47.png diff --git a/Weapons/octobrush.judd b/Weapons/octobrush.judd deleted file mode 100644 index b846d22..0000000 --- a/Weapons/octobrush.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Octobrush -nameDE=Kaligraf -callout=Brush -requiredLvl=4 -pointsForSpecial=200 -mainType=brush -subType=suction bomb -specialType=zipcaster -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/3/3d/S3_Weapon_Main_Octobrush.png diff --git a/Weapons/piss_schwapper.judd b/Weapons/piss_schwapper.judd deleted file mode 100644 index f692935..0000000 --- a/Weapons/piss_schwapper.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Boblobber -nameDE=Wannen-Schwapper -callout=Piss Schwapper -requiredLvl=19 -pointsForSpecial=190 -mainType=slosher -subType=sprinkler -specialType=ink storm -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/4/41/S3_Weapon_Main_Bloblobber.png diff --git a/Weapons/range_blaster.judd b/Weapons/range_blaster.judd deleted file mode 100644 index bf4db96..0000000 --- a/Weapons/range_blaster.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Range Blaster -nameDE=Fern-Blaster -callout=Range -requiredLvl=11 -pointsForSpecial=200 -mainType=blaster -subType=suction bomb -specialType=wave breaker -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/1/1d/S3_Weapon_Main_Range_Blaster.png diff --git a/Weapons/rapid_blaster.judd b/Weapons/rapid_blaster.judd deleted file mode 100644 index 0b45efa..0000000 --- a/Weapons/rapid_blaster.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Rapid Blaster -nameDE=Turbo-Blaster -callout=Rapid -requiredLvl=7 -pointsForSpecial=200 -mainType=blaster -subType=ink mine -specialType=triple inkstrike -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/6/6a/S3_Weapon_Main_Rapid_Blaster.png diff --git a/Weapons/rapid_blaster_pro.judd b/Weapons/rapid_blaster_pro.judd deleted file mode 100644 index a85ce12..0000000 --- a/Weapons/rapid_blaster_pro.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Rapid Blaster Pro -nameDE=Turbo-Blaster Plus -callout=Rapid Pro -requiredLvl=26 -pointsForSpecial=180 -mainType=blaster -subType=toxic mist -specialType=ink vac -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/c/c6/S3_Weapon_Main_Rapid_Blaster_Pro.png diff --git a/Weapons/slosher.judd b/Weapons/slosher.judd deleted file mode 100644 index 61a0b39..0000000 --- a/Weapons/slosher.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Slosher -nameDE=Schwapper -callout=Slosh -requiredLvl=3 -pointsForSpecial=200 -mainType=slosher -subType=splat bomb -specialType=triple inkstrike -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/4/42/S3_Weapon_Main_Slosher.png diff --git a/Weapons/splash_o_matic.judd b/Weapons/splash_o_matic.judd deleted file mode 100644 index e290b1f..0000000 --- a/Weapons/splash_o_matic.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splash-o-matic -nameDE=Fein-Disperser -callout=Splash -requiredLvl=16 -pointsForSpecial=200 -mainType=shooter -subType=burst bomb -specialType=crab tank -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/7/7b/S3_Weapon_Main_Splash-o-matic.png diff --git a/Weapons/splat_brella.judd b/Weapons/splat_brella.judd deleted file mode 100644 index 0bcef7e..0000000 --- a/Weapons/splat_brella.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splat Brella -nameDE=Parapulvisator -callout=Brella -requiredLvl=5 -pointsForSpecial=200 -mainType=brella -subType=sprinkler -specialType=triple inkstrike -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/2/27/S3_Weapon_Main_Splat_Brella.png diff --git a/Weapons/splat_charger.judd b/Weapons/splat_charger.judd deleted file mode 100644 index fe5883e..0000000 --- a/Weapons/splat_charger.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splat Charger -nameDE=Klecks-Konzentrator -callout=Charger -requiredLvl=2 -pointsForSpecial=200 -mainType=charger -subType=splat bomb -specialType=ink vac -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/4/41/S3_Weapon_Main_Splat_Charger.png diff --git a/Weapons/splat_dualies.judd b/Weapons/splat_dualies.judd deleted file mode 100644 index 891d963..0000000 --- a/Weapons/splat_dualies.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splat Dualies -nameDE=Klecks-Doppler -callout=Dualies -requiredLvl=3 -pointsForSpecial=200 -mainType=dualie -subType=suction bomb -specialType=crab tank -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/e/e8/S3_Weapon_Main_Splat_Dualies.png diff --git a/Weapons/splat_roller.judd b/Weapons/splat_roller.judd deleted file mode 100644 index 4bdecea..0000000 --- a/Weapons/splat_roller.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splat Roller -nameDE=Klecksroller -callout=Roller -requiredLvl=2 -pointsForSpecial=180 -mainType=roller -subType=curling bomb -specialType=big bubbler -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/c/c7/S3_Weapon_Main_Splat_Roller.png diff --git a/Weapons/splatana_stamper.judd b/Weapons/splatana_stamper.judd deleted file mode 100644 index 7d08d91..0000000 --- a/Weapons/splatana_stamper.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splatana Stamper -nameDE=Stempel-Splatana -callout=Stamper -requiredLvl=15 -pointsForSpecial=200 -mainType=splatana -subType=burst bomb -specialType=zipcaster -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/4/4d/S3_Weapon_Main_Splatana_Stamper.png diff --git a/Weapons/splatana_wiper.judd b/Weapons/splatana_wiper.judd deleted file mode 100644 index 5a20dab..0000000 --- a/Weapons/splatana_wiper.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splatana Wiper -nameDE=Wischer-Splatana -callout=Splatana -requiredLvl=5 -pointsForSpecial=180 -mainType=splatana -subType=torpedo -specialType=ultra stamp -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/e/e5/S3_Weapon_Main_Splatana_Wiper.png diff --git a/Weapons/splatterscope.judd b/Weapons/splatterscope.judd deleted file mode 100644 index ea64031..0000000 --- a/Weapons/splatterscope.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splatterscope -nameDE=Kiel-Konzentrator -callout=scope -requiredLvl=10 -pointsForSpecial=200 -mainType=charger -subType=splat bomb -specialType=ink vac -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/b/b2/S3_Weapon_Main_Splatterscope.png diff --git a/Weapons/splattershot.judd b/Weapons/splattershot.judd deleted file mode 100644 index 5015a83..0000000 --- a/Weapons/splattershot.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splattershot -nameDE=Klekser -callout=shot -requiredLvl=2 -pointsForSpecial=200 -mainType=shooter -subType=suction bomb -specialType=trizooka -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/b/bf/S3_Weapon_Main_Splattershot.png diff --git a/Weapons/splattershot_jr.judd b/Weapons/splattershot_jr.judd deleted file mode 100644 index 5409e86..0000000 --- a/Weapons/splattershot_jr.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splattershot Jr. -nameDE=Klekser Jr. -callout=Jr. -requiredLvl=1 -pointsForSpecial=180 -mainType=shooter -subType=splat bomb -specialType=big bubbler -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/1/1e/S3_Weapon_Main_Splattershot_Jr..png diff --git a/Weapons/splattershot_pro.judd b/Weapons/splattershot_pro.judd deleted file mode 100644 index 4c5c0ef..0000000 --- a/Weapons/splattershot_pro.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Splattershot Pro -nameDE=Profi-Klekser -callout=Pro -requiredLvl=9 -pointsForSpecial=200 -mainType=shooter -subType=angle shooter -specialType=crab tank -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/7/77/S3_Weapon_Main_Splattershot_Pro.png diff --git a/Weapons/sploosh_o_matic.judd b/Weapons/sploosh_o_matic.judd deleted file mode 100644 index 66bb124..0000000 --- a/Weapons/sploosh_o_matic.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Sploosh-o-matic -nameDE=Disperser -callout=Sploosh -requiredLvl=9 -pointsForSpecial=200 -mainType=shooter -subType=curling bomb -specialType=ultra stamp -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/5/59/S3_Weapon_Main_Sploosh-o-matic.png diff --git a/Weapons/squeezer.judd b/Weapons/squeezer.judd deleted file mode 100644 index 700a1f4..0000000 --- a/Weapons/squeezer.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Squeezer -nameDE=Quetscher -callout=Squeezer -requiredLvl=19 -pointsForSpecial=200 -mainType=shooter -subType=splash wall -specialType=trizooka -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/c/cb/S3_Weapon_Main_Squeezer.png diff --git a/Weapons/tenta_brella.judd b/Weapons/tenta_brella.judd deleted file mode 100644 index 32aeb50..0000000 --- a/Weapons/tenta_brella.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Tenta Brella -nameDE=Camp-Pluviator -callout=Tent -requiredLvl=16 -pointsForSpecial=190 -mainType=brella -subType=squid beakon -specialType=ink vac -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/1/1e/S3_Weapon_Main_Tenta_Brella.png diff --git a/Weapons/trashcan.judd b/Weapons/trashcan.judd deleted file mode 100644 index f0f38d5..0000000 --- a/Weapons/trashcan.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Aerospray MG -nameDE=Airbrush MG -callout=Trashcan -requiredLvl=5 -pointsForSpecial=200 -mainType=shooter -subType=fizzy bomb -specialType=reefslider -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/c/c5/S3_Weapon_Main_Aerospray_MG.png diff --git a/Weapons/tri_slosher.judd b/Weapons/tri_slosher.judd deleted file mode 100644 index 034fc82..0000000 --- a/Weapons/tri_slosher.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Tri-Slosher -nameDE=3R-Schwapper -callout=IKEA -requiredLvl=10 -pointsForSpecial=190 -mainType=slosher -subType=toxic mist -specialType=inkjet -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/d/dc/S3_Weapon_Main_Tri-Slosher.png diff --git a/Weapons/tri_stringer.judd b/Weapons/tri_stringer.judd deleted file mode 100644 index 81148d8..0000000 --- a/Weapons/tri_stringer.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Tri-Stringer -nameDE=Tri-Stringer -callout=Stringer -requiredLvl=4 -pointsForSpecial=200 -mainType=stringer -subType=toxic mist -specialType=killer wail 5.1 -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/4/49/S3_Weapon_Main_Tri-Stringer.png diff --git a/Weapons/undercover_brella.judd b/Weapons/undercover_brella.judd deleted file mode 100644 index a134d63..0000000 --- a/Weapons/undercover_brella.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Undercover Brella -nameDE=UnderCover -callout=Undercover -requiredLvl=18 -pointsForSpecial=180 -mainType=brella -subType=ink mine -specialType=reefslider -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/5/5d/S3_Weapon_Main_Undercover_Brella.png diff --git a/Weapons/version.info b/Weapons/version.info deleted file mode 100644 index 5667441..0000000 --- a/Weapons/version.info +++ /dev/null @@ -1,2 +0,0 @@ -#Wed Nov 02 20:22:53 CET 2022 -basedOnSplatoonVersion=1.2.1 diff --git a/Weapons/waschmaschiene.judd b/Weapons/waschmaschiene.judd deleted file mode 100644 index 7eb2127..0000000 --- a/Weapons/waschmaschiene.judd +++ /dev/null @@ -1,10 +0,0 @@ -#Tue Sep 27 23:22:46 CEST 2022 -nameEN=Sloshing Machine -nameDE=Trommel-Schwapper -callout=Machine -requiredLvl=14 -pointsForSpecial=210 -mainType=slosher -subType=fizzy bomb -specialType=booyah bomb -imgLink=https://cdn.wikimg.net/en/splatoonwiki/images/3/38/S3_Weapon_Main_Sloshing_Machine.png diff --git a/build.gradle.kts b/build.gradle.kts index 51cce4c..40ba828 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,19 +1,45 @@ +import org.jetbrains.gradle.ext.ProjectSettings +import org.jetbrains.gradle.ext.TaskTriggersConfig + plugins { java id("com.github.johnrengelman.shadow") version "7.1.2" id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.6" + `maven-publish` } group = "de.limited_dev" - - -version = "v1.5.4-build1" -var splatoonPatchBased = "1.2.1" +version = System.getenv("CI_COMMIT_TAG") ?: System.getenv("CI_COMMIT_SHORT_SHA")?.let { "$it-dev" } + ?: "DevelopmentBuild" //"v1.5.5-build1" +var splatoonPatchBased = "2.0.0" var jdaVersion = "5.0.0-alpha.20" +val mavenArtifact = "lil_Judd" +project.base.archivesName.set(mavenArtifact) repositories { mavenCentral() maven("https://m2.dv8tion.net/releases") + maven { + name = "Gitlab" + val projectId = System.getenv("CI_PROJECT_ID") + val apiV4 = System.getenv("CI_API_V4_URL") + url = uri("https://$apiV4/projects/$projectId/packages/maven") + authentication { + create("header", HttpHeaderAuthentication::class.java) { + if (System.getenv("CI_JOB_TOKEN") != null) { + credentials(HttpHeaderCredentials::class) { + name = "Job-Token" + value = System.getenv("CI_JOB_TOKEN") + } + } else { + credentials(HttpHeaderCredentials::class) { + name = "Private-Token" + value = project.ext["myGitlabToken"] as String + } + } + } + } + } } dependencies { @@ -70,6 +96,16 @@ tasks { expand(props) into(templateDest) } + + withType { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}" } + } + + archiveBaseName.set(mavenArtifact) + + dependsOn("generateTemplates", "processResources") + } } sourceSets.main { @@ -87,6 +123,35 @@ java{ targetCompatibility = JavaVersion.VERSION_17 } +publishing { + publications { + create("mavenJava") { + version = project.version as String + artifactId = mavenArtifact + from(components["java"]) + } + } + + repositories { + if (System.getenv("CI_JOB_TOKEN") != null) { + maven { + name = "GitLab" + val projectId = System.getenv("CI_PROJECT_ID") + val apiV4 = System.getenv("CI_API_V4_URL") + url = uri("$apiV4/projects/$projectId/packages/maven") + authentication { + create("token", HttpHeaderAuthentication::class.java) { + credentials(HttpHeaderCredentials::class.java) { + name = "Job-Token" + value = System.getenv("CI_JOB_TOKEN") + } + } + } + } + } + } +} + rootProject.idea.project { this as ExtensionAware configure { diff --git a/src/main/java/de/limited_dev/lil_judd/features/maps/MapManager.java b/src/main/java/de/limited_dev/lil_judd/features/maps/MapManager.java index c20a1e9..3098930 100644 --- a/src/main/java/de/limited_dev/lil_judd/features/maps/MapManager.java +++ b/src/main/java/de/limited_dev/lil_judd/features/maps/MapManager.java @@ -21,6 +21,8 @@ public class MapManager { maps.add(new MapData("Sturgeon Shipyard", "Störwerft", "https://cdn.wikimg.net/en/splatoonwiki/images/a/a5/S3_Sturgeon_Shipyard.jpg")); maps.add(new MapData("MakoMart", "Cetacea-Markt", "https://cdn.wikimg.net/en/splatoonwiki/images/a/ac/S3_Mako_Mart.jpg")); maps.add(new MapData("Wahoo World", "Flunder-Funpark", "https://cdn.wikimg.net/en/splatoonwiki/images/5/53/S3_Wahoo_World.jpg")); + maps.add(new MapData("Brinewater Springs", "Kusaya-Quellen", "https://cdn.wikimg.net/en/splatoonwiki/images/b/bf/S3_Brinewater_Springs.png")); + maps.add(new MapData("Flounder Heights", "Schollensiedlung", "https://cdn.wikimg.net/en/splatoonwiki/images/2/23/S3_Stage_Flounder_Heights.png")); } public static MapData getMapData(String name) {