Merge pull request #461 from Shynixn/development

Merge changes to Master --release

.github/workflows/main.yml

@@ -55,7 +55,7 @@ jobs:
           chmod +x gradlew
           wget "https://jitpack.io/com/github/MilkBowl/VaultAPI/1.7/VaultAPI-1.7.jar"
           mvn install:install-file -Dfile=VaultAPI-1.7.jar -DgroupId=net.milkbowlvault -DartifactId=VaultAPI -Dversion=1.7 -Dpackaging=jar
-          ./gradlew build pluginJar
+          ./gradlew build pluginJars
           echo "RELEASE_VERSION=$(./gradlew -q printVersion)" >> $GITHUB_ENV
 
       - name: Create Github Release
@@ -78,24 +78,19 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: /home/runner/work/BlockBall/BlockBall/blockball-bukkit-plugin/build/libs/blockball-bukkit-plugin-${{ env.RELEASE_VERSION }}.jar
+          asset_path: /home/runner/work/BlockBall/BlockBall/blockball-bukkit-plugin/build/libs/blockball-bukkit-plugin-${{ env.RELEASE_VERSION }}-latest.jar
           asset_name: BlockBall.jar
           asset_content_type: application/jar
 
-      - name: Build Java Application with all flag
-        run: |
-          sed -i "s/###VERSION###/all/g" ./blockball-bukkit-plugin/src/main/java/com/github/shynixn/blockball/bukkit/BlockBallPlugin.kt
-          ./gradlew build pluginJar      
-
-      - name: Upload All Bukkit Release to Github
+      - name: Upload Legacy Bukkit Release to Github
         if: "contains(github.event.head_commit.message, '--release') && contains(github.ref, 'master')"
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: /home/runner/work/BlockBall/BlockBall/blockball-bukkit-plugin/build/libs/blockball-bukkit-plugin-${{ env.RELEASE_VERSION }}.jar
-          asset_name: BlockBall-All.jar
+          asset_path: /home/runner/work/BlockBall/BlockBall/blockball-bukkit-plugin/build/libs/blockball-bukkit-plugin-${{ env.RELEASE_VERSION }}-legacy.jar
+          asset_name: BlockBall-Legacy.jar
           asset_content_type: application/jar
 
   Documentation:

Dockerfile

@@ -18,13 +18,7 @@ RUN yum install maven -y
 RUN yum install wget -y
 RUN yum install git -y
 RUN wget "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar"
-RUN java -jar BuildTools.jar --rev 1.17.1 --remapped
-RUN java -jar BuildTools.jar --rev 1.18 --remapped
-RUN java -jar BuildTools.jar --rev 1.18.2 --remapped
-RUN java -jar BuildTools.jar --rev 1.19 --remapped
-RUN java -jar BuildTools.jar --rev 1.19.3 --remapped
-RUN java -jar BuildTools.jar --rev 1.19.4 --remapped
-RUN java -jar BuildTools.jar --rev 1.20.1 --remapped
+RUN java -jar BuildTools.jar --rev 1.20.2 --remapped
 
 # 3. Build plugin for 1.8 - latest with jdk17
 FROM amazoncorretto:17 AS plugin-jdk17
@@ -43,7 +37,7 @@ RUN ./gradlew build pluginJar --no-daemon
 # 4. Launch a minecraft server with jdk17 and plugin
 FROM amazoncorretto:17
 # Change to the current plugin version present in build.gradle
-ENV PLUGIN_VERSION=6.34.2
+ENV PLUGIN_VERSION=6.35.0
 # Change to the server version you want to test.
 ENV SERVER_VERSION=spigot-1.18.jar
 # Port of the Minecraft Server.

README.md

@@ -13,7 +13,7 @@ BlockBall is a spigot plugin to play soccer games in Minecraft.
 
 * Uses blocks as balls in minecraft
 * Games are completely customizable
-* Version support 1.8.R3 - 1.20.R1
+* Version support 1.8.R3 - 1.20.R2
 * Check out the [BlockBall-Spigot-Page](https://www.spigotmc.org/resources/15320/) to get more information.
 
 ## Installation
@@ -31,7 +31,7 @@ BlockBall is a spigot plugin to play soccer games in Minecraft.
 
 * Install Java 17 or higher
 * Fork the BlockBall project on github and clone it to your local environment.
-* BlockBall requires spigot server implementations from 1.16 to 1.20 to be correctly installed in your local Maven cache.
+* BlockBall requires multiple spigot versions to be correctly installed in your local Maven cache.
   As this requires multiple java version to build different versions, a Dockerfile is provided to build these dependencies in a docker container
   and then copy it to your local Maven cache.
 

blockball-api/src/main/java/com/github/shynixn/blockball/api/business/enumeration/ParticleType.kt

@@ -40,231 +40,226 @@ enum class ParticleType(
         /**
          * Minecraft Id for 1.12.
          */
-        val minecraftId_112: String,
-
-        /**
-         * Version where this effect was added.
-         */
-        val sinceVersion: Version) {
+        val minecraftId_112: String) {
 
     /**
      * No Particle.
      */
-    NONE("none", "none", "none", Version.VERSION_1_8_R1),
+    NONE("none", "none", "none"),
     /**
      * Explosion.
      */
-    EXPLOSION_NORMAL("explode", "poof", "explosion", Version.VERSION_1_8_R1),
+    EXPLOSION_NORMAL("explode", "poof", "explosion"),
     /**
      * Large explosion.
      */
-    EXPLOSION_LARGE("largeexplode", "explosion", "large_explosion", Version.VERSION_1_8_R1),
+    EXPLOSION_LARGE("largeexplode", "explosion", "large_explosion"),
     /**
      * Huge explosion.
      */
-    EXPLOSION_HUGE("hugeexplosion", "explosion_emitter", "huge_explosion", Version.VERSION_1_8_R1),
+    EXPLOSION_HUGE("hugeexplosion", "explosion_emitter", "huge_explosion"),
     /**
      * Firework.
      */
-    FIREWORKS_SPARK("fireworksSpark", "firework", "fireworks_spark", Version.VERSION_1_8_R1),
+    FIREWORKS_SPARK("fireworksSpark", "firework", "fireworks_spark"),
     /**
      * Water Bubble simple.
      */
-    WATER_BUBBLE("bubble", "bubble", "water_bubble", Version.VERSION_1_8_R1),
+    WATER_BUBBLE("bubble", "bubble", "water_bubble"),
     /**
      * Water Bubble up.
      */
-    WATER_BUBBLE_UP("bubble_column_up", "bubble_column_up", "bubble_column_up", Version.VERSION_1_13_R1),
+    WATER_BUBBLE_UP("bubble_column_up", "bubble_column_up", "bubble_column_up"),
     /**
      * Water Bubble pop.
      */
-    WATER_BUBBLE_POP("bubble_pop", "bubble_pop", "bubble_pop", Version.VERSION_1_13_R1),
+    WATER_BUBBLE_POP("bubble_pop", "bubble_pop", "bubble_pop"),
     /**
      * Water Splash.
      */
-    WATER_SPLASH("splash", "splash", "water_splash", Version.VERSION_1_8_R1),
+    WATER_SPLASH("splash", "splash", "water_splash"),
     /**
      * Fishing effect.
      */
-    WATER_WAKE("wake", "fishing", "water_wake", Version.VERSION_1_8_R1),
+    WATER_WAKE("wake", "fishing", "water_wake"),
     /**
      * Underwater bubbles.
      */
-    SUSPENDED("suspended", "underwater", "suspended", Version.VERSION_1_8_R1),
+    SUSPENDED("suspended", "underwater", "suspended"),
     /**
      * Unused effect.
      */
-    SUSPENDED_DEPTH("depthsuspend", "depthsuspend", "suspended_depth", Version.VERSION_1_8_R1),
+    SUSPENDED_DEPTH("depthsuspend", "depthsuspend", "suspended_depth"),
     /**
      * Critical damage.
      */
-    CRIT("crit", "crit", "critical_hit", Version.VERSION_1_8_R1),
+    CRIT("crit", "crit", "critical_hit"),
     /**
      * Critical magical damage.
      */
-    CRIT_MAGIC("magicCrit", "enchanted_hit", "magic_critical_hit", Version.VERSION_1_8_R1),
+    CRIT_MAGIC("magicCrit", "enchanted_hit", "magic_critical_hit"),
     /**
      * Water effect.
      */
-    CURRENTDOWN("current_down", "current_down", "current_down", Version.VERSION_1_13_R1),
+    CURRENTDOWN("current_down", "current_down", "current_down"),
     /**
      * Smoke.
      */
-    SMOKE_NORMAL("smoke", "smoke", "smoke", Version.VERSION_1_8_R1),
+    SMOKE_NORMAL("smoke", "smoke", "smoke"),
     /**
      * Large Smoke.
      */
-    SMOKE_LARGE("largesmoke", "large_smoke", "large_smoke", Version.VERSION_1_8_R1),
+    SMOKE_LARGE("largesmoke", "large_smoke", "large_smoke"),
     /**
      * Spell.
      */
-    SPELL("spell", "effect", "spell", Version.VERSION_1_8_R1),
+    SPELL("spell", "effect", "spell"),
     /**
      * Instant Spell.
      */
-    SPELL_INSTANT("instantSpell", "instant_effect", "instant_spell", Version.VERSION_1_8_R1),
+    SPELL_INSTANT("instantSpell", "instant_effect", "instant_spell"),
     /**
      * Mob Spell.
      */
-    SPELL_MOB("mobSpell", "entity_effect", "instant_spell", Version.VERSION_1_8_R1),
+    SPELL_MOB("mobSpell", "entity_effect", "instant_spell"),
     /**
      * Mob Ambient Spell.
      */
-    SPELL_MOB_AMBIENT("mobSpellAmbient", "mob_spell", "mob_spell", Version.VERSION_1_8_R1),
+    SPELL_MOB_AMBIENT("mobSpellAmbient", "mob_spell", "mob_spell"),
     /**
      * Witch Spell.
      */
-    SPELL_WITCH("witchMagic", "witch", "witch_spell", Version.VERSION_1_8_R1),
+    SPELL_WITCH("witchMagic", "witch", "witch_spell"),
     /**
      * Drip water.
      */
-    DRIP_WATER("dripWater", "dripping_water", "drip_water", Version.VERSION_1_8_R1),
+    DRIP_WATER("dripWater", "dripping_water", "drip_water"),
     /**
      * Drip lava.
      */
-    DRIP_LAVA("dripLava", "dripping_lava", "drip_lava", Version.VERSION_1_8_R1),
+    DRIP_LAVA("dripLava", "dripping_lava", "drip_lava"),
     /**
      * Angry villager.
      */
-    VILLAGER_ANGRY("angryVillager", "angry_villager", "angry_villager", Version.VERSION_1_8_R1),
+    VILLAGER_ANGRY("angryVillager", "angry_villager", "angry_villager"),
     /**
      * Happy villager.
      */
-    VILLAGER_HAPPY("happyVillager", "happy_villager", "happy_villager", Version.VERSION_1_8_R1),
+    VILLAGER_HAPPY("happyVillager", "happy_villager", "happy_villager"),
     /**
      * Mycelium.
      */
-    TOWN_AURA("townaura", "mycelium", "town_aura", Version.VERSION_1_8_R1),
+    TOWN_AURA("townaura", "mycelium", "town_aura"),
     /**
      * Note..
      */
-    NOTE("note", "note", "note", Version.VERSION_1_8_R1),
+    NOTE("note", "note", "note"),
     /**
      * Portal.
      */
-    PORTAL("portal", "portal", "portal", Version.VERSION_1_8_R1),
+    PORTAL("portal", "portal", "portal"),
     /**
      * Nautilus.
      */
-    NAUTILUS("nautilus", "nautilus", "nautilus", Version.VERSION_1_13_R1),
+    NAUTILUS("nautilus", "nautilus", "nautilus"),
     /**
      * Enchantment.
      */
-    ENCHANTMENT_TABLE("enchantmenttable", "enchant", "enchanting_glyphs", Version.VERSION_1_8_R1),
+    ENCHANTMENT_TABLE("enchantmenttable", "enchant", "enchanting_glyphs"),
     /**
      * Flame.
      */
-    FLAME("flame", "flame", "flame", Version.VERSION_1_8_R1),
+    FLAME("flame", "flame", "flame"),
     /**
      * Lava.
      */
-    LAVA("lava", "lava", "lava", Version.VERSION_1_8_R1),
+    LAVA("lava", "lava", "lava"),
     /**
      * Squid.
      */
-    SQUID_INK("squid_ink", "squid_ink", "squid_ink", Version.VERSION_1_13_R1),
+    SQUID_INK("squid_ink", "squid_ink", "squid_ink"),
     /**
      * Footstep.
      */
-    FOOTSTEP("footstep", "footstep", "footstep", Version.VERSION_1_8_R1),
+    FOOTSTEP("footstep", "footstep", "footstep"),
     /**
      * Cloud.
      */
-    CLOUD("cloud", "cloud", "cloud", Version.VERSION_1_8_R1),
+    CLOUD("cloud", "cloud", "cloud"),
     /**
      * Redstone.
      */
-    REDSTONE("reddust", "dust", "redstone_dust", Version.VERSION_1_8_R1),
+    REDSTONE("reddust", "dust", "redstone_dust"),
     /**
      * Snowball.
      */
-    SNOWBALL("snowballpoof", "item_snowball", "snowball", Version.VERSION_1_8_R1),
+    SNOWBALL("snowballpoof", "item_snowball", "snowball"),
     /**
      * Snowshovel.
      */
-    SNOW_SHOVEL("snowshovel", "snowshovel", "snow_shovel", Version.VERSION_1_8_R1),
+    SNOW_SHOVEL("snowshovel", "snowshovel", "snow_shovel"),
     /**
      * Slime.
      */
-    SLIME("slime", "item_slime", "slime", Version.VERSION_1_8_R1),
+    SLIME("slime", "item_slime", "slime"),
     /**
      * Heart.
      */
-    HEART("heart", "heart", "heart", Version.VERSION_1_8_R1),
+    HEART("heart", "heart", "heart"),
     /**
      * Barrier.
      */
-    BARRIER("barrier", "barrier", "barrier", Version.VERSION_1_8_R1),
+    BARRIER("barrier", "barrier", "barrier"),
     /**
      * ItemCrack.
      */
-    ITEM_CRACK("iconcrack", "item", "item_crack", Version.VERSION_1_8_R1),
+    ITEM_CRACK("iconcrack", "item", "item_crack"),
     /**
      * BlockCrack.
      */
-    BLOCK_CRACK("blockcrack", "block", "block_crack", Version.VERSION_1_8_R1),
+    BLOCK_CRACK("blockcrack", "block", "block_crack"),
     /**
      * Blockdust.
      */
-    BLOCK_DUST("blockdust", "block", "block_dust", Version.VERSION_1_8_R1),
+    BLOCK_DUST("blockdust", "block", "block_dust"),
     /**
      * Rain.
      */
-    WATER_DROP("droplet", "rain", "water_drop", Version.VERSION_1_8_R1),
+    WATER_DROP("droplet", "rain", "water_drop"),
     /**
      * Unknown.
      */
-    TEM_TAKE("take", "take", "instant_spell", Version.VERSION_1_8_R1),
+    TEM_TAKE("take", "take", "instant_spell"),
     /**
      * Guardian scare.
      */
-    MOB_APPEARANCE("mobappearance", "elder_guardian", "guardian_appearance", Version.VERSION_1_8_R1),
+    MOB_APPEARANCE("mobappearance", "elder_guardian", "guardian_appearance"),
     /**
      * Dragon Breath.
      */
-    DRAGON_BREATH("dragonbreath", "dragon_breath", "dragon_breath", Version.VERSION_1_9_R1),
+    DRAGON_BREATH("dragonbreath", "dragon_breath", "dragon_breath"),
     /**
      * End rod.
      */
-    END_ROD("endRod", "end_rod", "end_rod", Version.VERSION_1_9_R1),
+    END_ROD("endRod", "end_rod", "end_rod"),
     /**
      * Damage Indicator.
      */
-    DAMAGE_INDICATOR("damageIndicator", "damage_indicator", "damage_indicator", Version.VERSION_1_9_R1),
+    DAMAGE_INDICATOR("damageIndicator", "damage_indicator", "damage_indicator"),
     /**
      * Sweep Attack.
      */
-    SWEEP_ATTACK("sweepAttack", "sweep_attack", "sweep_attack", Version.VERSION_1_9_R1),
+    SWEEP_ATTACK("sweepAttack", "sweep_attack", "sweep_attack"),
     /**
      * Falling Dust.
      */
-    FALLING_DUST("fallingdust", "falling_dust", "falling_dust", Version.VERSION_1_10_R1),
+    FALLING_DUST("fallingdust", "falling_dust", "falling_dust"),
     /**
      * Totem.
      */
-    TOTEM("totem", "totem_of_undying", "instant_spell", Version.VERSION_1_11_R1),
+    TOTEM("totem", "totem_of_undying", "instant_spell"),
     /**
      * Spit.
      */
-    SPIT("spit", "spit", "instant_spell", Version.VERSION_1_11_R1);
-}
+    SPIT("spit", "spit", "instant_spell");
+}