PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 19:46:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Some more cleanup

Browse source
This commit is contained in:
Sollace 2020-05-28 18:30:23 +02:00
parent 2f6ffe43a9
commit d712554639
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/minelittlepony/unicopia/TreeType.java
View file

@ -3,7 +3,7 @@ package com.minelittlepony.unicopia;
import java.util.stream.Collectors;
import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.util.collection.Weighted;
import com.minelittlepony.unicopia.util.Weighted;
import java.util.Arrays;
import java.util.HashSet;

2
src/main/java/com/minelittlepony/unicopia/magic/Suppressable.java
View file

@ -8,7 +8,7 @@ public interface Suppressable {
/**
* Returns true if this spell is currently still suppressed.
*/
boolean getSuppressed();
boolean isSuppressed();
/**
* Returns true if this spell can be suppressed by the given other spell and caster.

10
src/main/java/com/minelittlepony/unicopia/magic/spell/DisguiseSpell.java
View file

@ -90,7 +90,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
}
@Override
public boolean getSuppressed() {
public boolean isSuppressed() {
return suppressionCounter > 0;
}
@ -330,7 +330,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
public boolean update(Caster<?> source, boolean tick) {
LivingEntity owner = source.getOwner();
if (getSuppressed()) {
if (isSuppressed()) {
suppressionCounter--;
owner.setInvisible(false);
@ -446,7 +446,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
@Override
public void render(Caster<?> source) {
if (getSuppressed()) {
if (isSuppressed()) {
source.spawnParticles(MagicParticleEffect.UNICORN, 5);
source.spawnParticles(UParticles.CHANGELING_MAGIC, 5);
} else if (source.getWorld().random.nextInt(30) == 0) {
@ -516,7 +516,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
@Override
public float getTargetEyeHeight(Pony player) {
if (entity != null && !getSuppressed()) {
if (entity != null && !isSuppressed()) {
if (entity instanceof FallingBlockEntity) {
return 0.5F;
}
@ -527,7 +527,7 @@ public class DisguiseSpell extends AbstractSpell implements AttachableSpell, Sup
@Override
public float getTargetBodyHeight(Pony player) {
if (entity != null && !getSuppressed()) {
if (entity != null && !isSuppressed()) {
if (entity instanceof FallingBlockEntity) {
return 0.9F;
}

2
src/main/java/com/minelittlepony/unicopia/util/collection/Weighted.java → src/main/java/com/minelittlepony/unicopia/util/Weighted.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia.util.collection;
package com.minelittlepony.unicopia.util;
import java.util.List;
import java.util.Optional;