Cumulative Armor-Scheduling changes (Rainbow Armor + Radiation update) #3189

TheBusyBiscuit · 2021-08-01T12:21:04Z

This is a cumulative pull requests consisting of:

- item setup - research - rainbow armor task Add AbstractArmorTask as a base class for ArmorTask and RainbowArmorTask

Add RainbowArmorPiece Fix a bug where the color would not change for every player at the same time, but rather per-player online (per scheduling interval)

Add a config parameter to modify the rate at which the RainbowArmor changes colors Change small things related to the RainbowArmor

…te other types of rainbow armor

Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>

Use stream to map dye colors to colors

…n/tasks/RadioactivityTask.java Co-authored-by: Daniel Walsh <walshydev@gmail.com>

…n/listeners/RadioactivityListener.java Co-authored-by: Daniel Walsh <walshydev@gmail.com>

…es/Radioactivity.java Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>

Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>

…n/tasks/RadioactivityTask.java Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>

Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>

sonarcloud · 2021-08-04T09:15:55Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
2 Code Smells

21.0% Coverage
0.0% Duplication

Sfiguz7

Just the one comment

Sfiguz7 · 2021-08-05T05:14:09Z

...in/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SlimefunArmorTask.java

+    @ParametersAreNonnullByDefault
+    protected void onArmorPieceTick(Player p, SlimefunArmorPiece sfArmorPiece, ItemStack armorPiece) {
+        for (PotionEffect effect : sfArmorPiece.getPotionEffects()) {
+            p.removePotionEffect(effect.getType());


Why does this explicitly remove effects of the same type from the player before applying its own? This forcefully overrides higher level same-type effects or longer effects if the effect on the player is of equal or lower level.
We don't want to replace, for example, Jump Boost 5 with Jump Boost 2; similarly, since Spigot now supports multiple PotionEffects of the same type, instead of removing Jump Boost 1 to apply Jump Boost 2 we can just apply Jump Boost 2 and if by the time JB2 is over JB1 still has time left before expiring it will take over on its own

A fix can be made by making potion effects last updateInterval + 1s, then they will expire almost immediately after they have been removed.
That's how the radiation system I implemented does it.

…r-task-pr # Conflicts: # src/main/java/io/github/thebusybiscuit/slimefun4/api/items/HashedArmorpiece.java # src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/Radioactive.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/RadioactiveItem.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/Parachute.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/JetBoots.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/Jetpack.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/SolarHelmet.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/BeeWings.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java # src/test/java/io/github/thebusybiscuit/slimefun4/implementation/items/TestRadioactiveItem.java # src/test/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TestArmorTask.java

sonarcloud · 2021-10-01T09:37:26Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
1 Security Hotspot
3 Code Smells

21.0% Coverage
2.1% Duplication

…r-task-pr # Conflicts: # src/main/java/io/github/thebusybiscuit/slimefun4/api/items/HashedArmorpiece.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/RadioactiveItem.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/Parachute.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/RainbowArmorPiece.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/gadgets/SolarHelmet.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/RadioactivityListener.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/RadiationTask.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SolarHelmetTask.java # src/test/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TestArmorTask.java

Sfiguz7 · 2021-10-01T14:53:33Z

Formatting will need to be checked, see #3293
I messed up a couple things, will see if I can fix them but just in case I am putting a comment in

Continuation of armor task pull request #3189

sonarcloud · 2022-01-19T16:33:04Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
1 Security Hotspot
2 Code Smells

21.0% Coverage
2.1% Duplication

JustAHuman-xD · 2023-06-12T09:52:23Z

...ain/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/RainbowArmorTask.java

+                    if (sfArmorPiece instanceof RainbowArmorPiece && sfArmorPiece.canUse(p, true)) {
+                        updateRainbowArmor(item, (RainbowArmorPiece) sfArmorPiece);
+                    }


Can we use instanceof casting here instead of casting the sfArmorPiece again when calling the method?

JustAHuman-xD · 2023-06-12T09:53:37Z

...in/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SlimefunArmorTask.java

+    @Override
+    protected void onTick() {
+        // Do nothing
+    }


Is there any reason to override this?

JustAHuman-xD · 2023-06-12T09:55:34Z

...main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/SolarHelmetTask.java

+    @Override
+    protected void onTick() {
+        // Do nothing
+    }
+


Again is it necessary to override?

JustAHuman-xD · 2023-06-12T09:57:26Z

src/test/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TestArmorTask.java

-
-    @ParameterizedTest
-    @DisplayName("Test Radiation and Hazmat Suits")
-    @MethodSource("cartesianBooleans")
-    void testRadiactivity(boolean hazmat, boolean radioactiveFire) throws InterruptedException {
-        Player player = server.addPlayer();
-        TestUtilities.awaitProfile(player);
-
-        // Setting the time to noon, to exclude the Solar Helmet check
-        player.getWorld().setTime(16000);
-
-        ItemGroup itemGroup = TestUtilities.getItemGroup(plugin, "hazmat_suit_test");
-        SlimefunItemStack item = new SlimefunItemStack("MOCK_URANIUM_" + String.valueOf(hazmat).toUpperCase(Locale.ROOT) + "_" + String.valueOf(radioactiveFire).toUpperCase(Locale.ROOT), Material.EMERALD, "&aHi, I am deadly");
-        new RadioactiveItem(itemGroup, Radioactivity.VERY_DEADLY, item, RecipeType.NULL, new ItemStack[9]).register(plugin);
-
-        player.getInventory().setItemInMainHand(item.clone());
-        player.getInventory().setItemInOffHand(new ItemStack(Material.EMERALD_ORE));
-
-        if (hazmat) {
-            SlimefunItemStack chestplate = new SlimefunItemStack("MOCK_HAZMAT_SUIT_" + String.valueOf(radioactiveFire).toUpperCase(Locale.ROOT), Material.LEATHER_CHESTPLATE, "&4Hazmat Prototype");
-            MockHazmatSuit armor = new MockHazmatSuit(itemGroup, chestplate);
-            armor.register(plugin);
-
-            player.getInventory().setChestplate(chestplate.clone());
-        }
-
-        ArmorTask task = new ArmorTask(radioactiveFire);
-        task.run();
-
-        // Check if the Player is suffering from radiation
-        boolean radiation = player.getActivePotionEffects().containsAll(task.getRadiationEffects());
-        Assertions.assertEquals(!hazmat, radiation);
-        Assertions.assertEquals(!hazmat && radioactiveFire, player.getFireTicks() > 0);
-    }
-
-    /**
-     * This returns an {@link Arguments} {@link Stream} of boolean combinations.
-     * It performs a cartesian product on two boolean sets.
-     * 
-     * @return a {@link Stream} of {@link Arguments}
-     */
-    private static Stream<Arguments> cartesianBooleans() {
-        Stream<Boolean> stream = Stream.of(true, false);
-        return stream.flatMap(a -> Stream.of(true, false).map(b -> Arguments.of(a, b)));
-    }
-
 }


Is there a plan to re-do the tests with all of the armor and radiation related changes?

JustAHuman-xD · 2023-06-28T19:17:42Z

src/main/java/io/github/thebusybiscuit/slimefun4/core/radiation/RadiationSymptom.java

+
+import javax.annotation.Nonnull;
+
+import org.apache.commons.lang.Validate;


Suggested change

import org.apache.commons.lang.Validate;

import org.apache.commons.lang.Validate;

JustAHuman-xD · 2023-06-28T19:18:00Z

src/main/java/io/github/thebusybiscuit/slimefun4/core/radiation/RadiationSymptom.java

+        Validate.notNull(type, "The effect type cannot be null");
+        Validate.isTrue(minExposure > 0, "The minimum exposure must be greater than 0.");
+        Validate.isTrue(level >= 0, "The status effect level must be non-negative.");


Preconditions

JustAHuman-xD · 2023-06-28T19:18:09Z

src/main/java/io/github/thebusybiscuit/slimefun4/core/radiation/RadiationSymptom.java

+     */
+
+    public void apply(@Nonnull Player p) {
+        Validate.notNull(p, "The player cannot be null");


Preconditions

JustAHuman-xD · 2023-06-28T19:20:17Z

...in/java/io/github/thebusybiscuit/slimefun4/implementation/items/armor/RainbowArmorPiece.java

+    public RainbowArmorPiece(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, DyeColor[] dyeColors) {
+        super(itemGroup, item, recipeType, recipe, new PotionEffect[0]);
+
+        Validate.notEmpty(dyeColors, "RainbowArmorPiece colors cannot be empty!");


preconditions

JustAHuman-xD · 2023-06-28T19:22:03Z

...in/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/armor/AbstractArmorTask.java

+     *            Delay between two "runs" of this task in ticks
+     */
+    public final void schedule(@Nonnull Slimefun plugin, long tickInterval) {
+        Validate.notNull(plugin, "The plugin instance cannot be null!");


Preconditions

JustAHuman-xD · 2023-06-28T19:24:07Z

src/main/java/io/github/thebusybiscuit/slimefun4/utils/RadiationUtils.java

+    private RadiationUtils() {}
+
+    public static void clearExposure(@Nonnull Player p) {
+        Validate.notNull(p, "The player cannot be null");


Preconditions

JustAHuman-xD · 2023-06-28T19:24:11Z

src/main/java/io/github/thebusybiscuit/slimefun4/utils/RadiationUtils.java

+    }
+
+    public static int getExposure(@Nonnull Player p) {
+        Validate.notNull(p, "The player must not be null");


Preconditions

JustAHuman-xD · 2023-06-28T19:24:15Z

src/main/java/io/github/thebusybiscuit/slimefun4/utils/RadiationUtils.java

+    }
+
+    public static void addExposure(@Nonnull Player p, int exposure) {
+        Validate.notNull(p, "The player cannot be null");


Preconditions

JustAHuman-xD · 2023-06-28T19:24:19Z

src/main/java/io/github/thebusybiscuit/slimefun4/utils/RadiationUtils.java

+    }
+
+    public static void removeExposure(@Nonnull Player p, int exposure) {
+        Validate.notNull(p, "The player should not be null");


Preconditions

J3fftw1 · 2023-07-08T21:03:03Z

Handled in #3892

martinbrom and others added 30 commits May 28, 2021 14:42

Add Rainbow Armor

fd014f9

- item setup - research - rainbow armor task Add AbstractArmorTask as a base class for ArmorTask and RainbowArmorTask

Add Rainbow Leather

5cea93a

Change colors of the Rainbow Armor to the actual rainbow colors

3478208

Fix a bug where any leather armor acted as a piece of rainbow armor

0b82b2f

Add RainbowArmorPiece Fix a bug where the color would not change for every player at the same time, but rather per-player online (per scheduling interval)

Add missing annotation

f610b57

Make the RainbowLeather recipe more expensive

a0721f4

Add a config parameter to modify the rate at which the RainbowArmor changes colors Change small things related to the RainbowArmor

Pass colors to RainbowArmorPiece directly - makes it possible to crea…

b8727e3

…te other types of rainbow armor

Apply suggestions from code review

f98dbf0

Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>

Change tick rate of the rainbow armor

a3c8720

Use stream to map dye colors to colors

Move scheduling of ArmorTasks into the AbstractArmorTask

64aba26

Add the radiation concept

f81e87a

Document some stuff

b4fc8f3

IDE star imported, fixed

7e657ee

Code style guidelines

b2d0886

More editing

f10c9f1

More editing

19a211d

Update src/main/java/io/github/thebusybiscuit/slimefun4/implementatio…

0306898

…n/tasks/RadioactivityTask.java Co-authored-by: Daniel Walsh <walshydev@gmail.com>

Update src/main/java/io/github/thebusybiscuit/slimefun4/implementatio…

0099b17

…n/listeners/RadioactivityListener.java Co-authored-by: Daniel Walsh <walshydev@gmail.com>

Update src/main/java/io/github/thebusybiscuit/slimefun4/implementatio…

5587676

…n/listeners/RadioactivityListener.java Co-authored-by: Daniel Walsh <walshydev@gmail.com>

Requested changes

7bdd14c

More requested changes

d03b033

More requested changes

4dc5ad3

Update src/main/java/io/github/thebusybiscuit/slimefun4/core/attribut…

6950261

…es/Radioactivity.java Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>

Apply suggestions from code review

1f9ab86

Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>

fix

cbd4ab9

Apply suggestions from code review

9a14a6d

Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>

merge

10fc1cc

stuff

1706f03

Update src/main/java/io/github/thebusybiscuit/slimefun4/implementatio…

a965004

…n/tasks/RadioactivityTask.java Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>

Apply suggestions from code review

d058a1a

Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>

Sfiguz7 requested changes Aug 5, 2021

View reviewed changes

Sfiguz7 self-assigned this Aug 5, 2021

TheBusyBot added the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Sep 3, 2021

ybw0014 added 2 commits October 1, 2021 00:10

refactoring

38ac50d

ybw0014 mentioned this pull request Sep 30, 2021

Continuation of armor task pull request #3189 #3293

Merged

6 tasks

ybw0014 and others added 3 commits October 1, 2021 15:11

improve imports

d6af251

Merge conflicts

9359d69

More merge conflicts

46ad72c

ybw0014 added 2 commits October 1, 2021 21:57

format import

53768a4

TheBusyBot removed the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Oct 1, 2021

TheBusyBot added the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Dec 21, 2021

TheBusyBiscuit mentioned this pull request Dec 31, 2021

🚀 Roadmap / Upcoming changes and features #3170

Open

Merge pull request #3293 from guizhanss/armor-task-pr

7c54efd

Continuation of armor task pull request #3189

TheBusyBiscuit added ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! and removed ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! labels Jan 15, 2022

Fix merge conflicts

4d94d6e

svr333 removed the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Jan 19, 2022

TheBusyBot added the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Jul 19, 2022

JustAHuman-xD requested changes Jun 12, 2023

View reviewed changes

JustAHuman-xD requested changes Jun 28, 2023

View reviewed changes

J3fftw1 mentioned this pull request Jul 4, 2023

Cumulative Armor-Scheduling changes (Rainbow Armor + Radiation update) #3892

Merged

7 tasks

J3fftw1 closed this Jul 8, 2023

J3fftw1 deleted the feature/armor-tasks branch July 8, 2023 21:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cumulative Armor-Scheduling changes (Rainbow Armor + Radiation update) #3189

Cumulative Armor-Scheduling changes (Rainbow Armor + Radiation update) #3189

TheBusyBiscuit commented Aug 1, 2021

sonarcloud bot commented Aug 4, 2021

Sfiguz7 left a comment

Sfiguz7 Aug 5, 2021

Semisol Aug 5, 2021

sonarcloud bot commented Oct 1, 2021

Sfiguz7 commented Oct 1, 2021

sonarcloud bot commented Jan 19, 2022

JustAHuman-xD Jun 12, 2023

JustAHuman-xD Jun 12, 2023

JustAHuman-xD Jun 12, 2023

JustAHuman-xD Jun 12, 2023

JustAHuman-xD Jun 28, 2023

JustAHuman-xD Jun 28, 2023

JustAHuman-xD Jun 28, 2023

JustAHuman-xD Jun 28, 2023

JustAHuman-xD Jun 28, 2023

JustAHuman-xD Jun 28, 2023

JustAHuman-xD Jun 28, 2023

JustAHuman-xD Jun 28, 2023

JustAHuman-xD Jun 28, 2023

J3fftw1 commented Jul 8, 2023


		import javax.annotation.Nonnull;

		import org.apache.commons.lang.Validate;

Cumulative Armor-Scheduling changes (Rainbow Armor + Radiation update) #3189

Cumulative Armor-Scheduling changes (Rainbow Armor + Radiation update) #3189

Conversation

TheBusyBiscuit commented Aug 1, 2021

sonarcloud bot commented Aug 4, 2021

Sfiguz7 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Oct 1, 2021

Sfiguz7 commented Oct 1, 2021

sonarcloud bot commented Jan 19, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

J3fftw1 commented Jul 8, 2023