mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
[CI skip] Updated changelog and workflows
This commit is contained in:
parent
a64597e129
commit
5620528c1d
6
.github/workflows/auto-approve.yml
vendored
6
.github/workflows/auto-approve.yml
vendored
@ -1,7 +1,6 @@
|
|||||||
name: Auto approve
|
name: Auto approve
|
||||||
|
|
||||||
on:
|
on: pull_request
|
||||||
pull_request
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
auto-approve:
|
auto-approve:
|
||||||
@ -9,6 +8,9 @@ jobs:
|
|||||||
name: Auto approve Pull Request
|
name: Auto approve Pull Request
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
## Only run this on the main repo
|
||||||
|
if: github.repository == 'Slimefun/Slimefun4'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Approve via actions
|
- name: Approve via actions
|
||||||
uses: hmarr/auto-approve-action@v2.1.0
|
uses: hmarr/auto-approve-action@v2.1.0
|
||||||
|
3
.github/workflows/auto-squash.yml
vendored
3
.github/workflows/auto-squash.yml
vendored
@ -17,6 +17,9 @@ jobs:
|
|||||||
name: Auto squash
|
name: Auto squash
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
## Only run this on the main repo
|
||||||
|
if: github.repository == 'Slimefun/Slimefun4'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Auto squash
|
- name: Auto squash
|
||||||
uses: pascalgn/automerge-action@v0.13.1
|
uses: pascalgn/automerge-action@v0.13.1
|
||||||
|
2
.github/workflows/discord-webhook.yml
vendored
2
.github/workflows/discord-webhook.yml
vendored
@ -12,6 +12,8 @@ jobs:
|
|||||||
|
|
||||||
name: Discord Webhook
|
name: Discord Webhook
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
## Only run this on the main repo
|
||||||
if: github.repository == 'Slimefun/Slimefun4'
|
if: github.repository == 'Slimefun/Slimefun4'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
@ -62,6 +62,7 @@
|
|||||||
* Fixed #3027
|
* Fixed #3027
|
||||||
* Fixed #2978
|
* Fixed #2978
|
||||||
* Fixed #3041
|
* Fixed #3041
|
||||||
|
* Fixed #3036
|
||||||
* Possibly fixed #2927
|
* Possibly fixed #2927
|
||||||
|
|
||||||
## Release Candidate 22 (18 Apr 2021)
|
## Release Candidate 22 (18 Apr 2021)
|
||||||
|
@ -10,6 +10,7 @@ import javax.annotation.Nonnull;
|
|||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
import org.apache.commons.lang.Validate;
|
import org.apache.commons.lang.Validate;
|
||||||
|
import org.bukkit.Color;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Particle;
|
import org.bukkit.Particle;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
@ -248,7 +249,8 @@ public abstract class Network {
|
|||||||
*/
|
*/
|
||||||
public void display() {
|
public void display() {
|
||||||
if (manager.isVisualizerEnabled()) {
|
if (manager.isVisualizerEnabled()) {
|
||||||
SlimefunPlugin.runSync(new NetworkVisualizer(this));
|
// TODO: Make Color configurable / network-dependent
|
||||||
|
SlimefunPlugin.runSync(new NetworkVisualizer(this, Color.BLUE));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@ package io.github.thebusybiscuit.slimefun4.api.network;
|
|||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
|
import org.apache.commons.lang.Validate;
|
||||||
import org.bukkit.Color;
|
import org.bukkit.Color;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Particle;
|
import org.bukkit.Particle;
|
||||||
@ -18,7 +19,7 @@ class NetworkVisualizer implements Runnable {
|
|||||||
/**
|
/**
|
||||||
* The {@link DustOptions} define the {@link Color} and size of our particles.
|
* The {@link DustOptions} define the {@link Color} and size of our particles.
|
||||||
*/
|
*/
|
||||||
private final DustOptions options = new DustOptions(Color.BLUE, 3.5F);
|
private final DustOptions particleOptions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is our {@link Network} instance.
|
* This is our {@link Network} instance.
|
||||||
@ -31,8 +32,12 @@ class NetworkVisualizer implements Runnable {
|
|||||||
* @param network
|
* @param network
|
||||||
* The {@link Network} to visualize
|
* The {@link Network} to visualize
|
||||||
*/
|
*/
|
||||||
NetworkVisualizer(@Nonnull Network network) {
|
NetworkVisualizer(@Nonnull Network network, @Nonnull Color color) {
|
||||||
|
Validate.notNull(network, "The network should not be null.");
|
||||||
|
Validate.notNull(color, "The color cannot be null.");
|
||||||
|
|
||||||
this.network = network;
|
this.network = network;
|
||||||
|
this.particleOptions = new DustOptions(color, 3F);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -53,7 +58,7 @@ class NetworkVisualizer implements Runnable {
|
|||||||
* The {@link Location} of our node
|
* The {@link Location} of our node
|
||||||
*/
|
*/
|
||||||
private void spawnParticles(@Nonnull Location l) {
|
private void spawnParticles(@Nonnull Location l) {
|
||||||
l.getWorld().spawnParticle(Particle.REDSTONE, l.getX() + 0.5, l.getY() + 0.5, l.getZ() + 0.5, 1, 0, 0, 0, 1, options);
|
l.getWorld().spawnParticle(Particle.REDSTONE, l.getX() + 0.5, l.getY() + 0.5, l.getZ() + 0.5, 1, 0, 0, 0, 1, particleOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user