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

More cleanup

Browse source
This commit is contained in:
Sollace 2020-04-15 15:55:18 +02:00
parent 3beacf5f58
commit 7a6b0aabb5
23 changed files with 26 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/minelittlepony/unicopia/IKeyBinding.java Normal file
View file

@ -0,0 +1,9 @@
package com.minelittlepony.unicopia;
public interface IKeyBinding {
String getKeyCategory();
String getKeyName();
int getKeyCode();
}

18
src/main/java/com/minelittlepony/unicopia/IKeyBindingHandler.java
View file

@ -1,18 +0,0 @@
package com.minelittlepony.unicopia;
public interface IKeyBindingHandler {
void addKeybind(IKeyBinding bind);
default void onKeyInput() {
}
public interface IKeyBinding {
String getKeyCategory();
String getKeyName();
int getKeyCode();
}
}

3
src/main/java/com/minelittlepony/unicopia/InteractionManager.java
View file

@ -12,9 +12,10 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.world.ServerWorld;
public class InteractionManager {
public static InteractionManager instance = new InteractionManager();
public static InteractionManager instance() {
return UnicopiaCore.interactionManager;
return instance;
}
public boolean isClientPlayer(@Nullable PlayerEntity player) {

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

@ -27,8 +27,6 @@ public class UnicopiaCore implements ModInitializer {
public static final Logger LOGGER = LogManager.getLogger();
public static InteractionManager interactionManager = new InteractionManager();
private static Channel channel;
public static Channel getConnection() {

5
src/main/java/com/minelittlepony/unicopia/ability/IPower.java
View file

@ -2,13 +2,13 @@ package com.minelittlepony.unicopia.ability;
import javax.annotation.Nullable;
import com.minelittlepony.unicopia.IKeyBindingHandler;
import com.minelittlepony.unicopia.IKeyBinding;
import com.minelittlepony.unicopia.Race;
import com.minelittlepony.unicopia.entity.player.IPlayer;
import net.minecraft.world.World;
public interface IPower<T extends IPower.IData> extends IKeyBindingHandler.IKeyBinding {
public interface IPower<T extends IPower.IData> extends IKeyBinding {
@Override
default String getKeyCategory() {
@ -20,7 +20,6 @@ public interface IPower<T extends IPower.IData> extends IKeyBindingHandler.IKeyB
*/
int getWarmupTime(IPlayer player);
/**
* Returns the number of ticks allowed for cooldown
*/

6
src/main/java/com/minelittlepony/unicopia/client/KeyBindingsHandler.java
View file

@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.client;
import java.util.HashSet;
import java.util.Set;
import com.minelittlepony.unicopia.IKeyBindingHandler;
import com.minelittlepony.unicopia.IKeyBinding;
import com.minelittlepony.unicopia.SpeciesList;
import com.minelittlepony.unicopia.UnicopiaCore;
import com.minelittlepony.unicopia.ability.PowersRegistry;
@ -17,7 +17,7 @@ import net.minecraft.client.util.InputUtil;
import net.minecraft.util.Identifier;
class KeyBindingsHandler implements IKeyBindingHandler {
class KeyBindingsHandler {
private final MinecraftClient client = MinecraftClient.getInstance();
private final Set<KeyBinding> bindings = new HashSet<>();
@ -25,7 +25,6 @@ class KeyBindingsHandler implements IKeyBindingHandler {
private final Set<KeyBinding> pressed = new HashSet<>();
@Override
public void addKeybind(IKeyBinding p) {
KeyBindingRegistry.INSTANCE.addCategory(p.getKeyCategory());
@ -35,7 +34,6 @@ class KeyBindingsHandler implements IKeyBindingHandler {
bindings.add(b);
}
@Override
public void onKeyInput() {
if (client.currentScreen != null
|| client.player == null) {

5
src/main/java/com/minelittlepony/unicopia/client/UnicopiaCoreClient.java
View file

@ -8,7 +8,6 @@ import javax.annotation.Nullable;
import com.minelittlepony.common.event.ClientReadyCallback;
import com.minelittlepony.jumpingcastle.api.Target;
import com.minelittlepony.unicopia.Config;
import com.minelittlepony.unicopia.IKeyBindingHandler;
import com.minelittlepony.unicopia.InteractionManager;
import com.minelittlepony.unicopia.Race;
import com.minelittlepony.unicopia.SpeciesList;
@ -43,7 +42,7 @@ import net.minecraft.world.ExtendedBlockView;
public class UnicopiaCoreClient extends InteractionManager implements ClientModInitializer {
private final IKeyBindingHandler keyboard = new KeyBindingsHandler();
private final KeyBindingsHandler keyboard = new KeyBindingsHandler();
/**
* The race preferred by the client - as determined by mine little pony.
@ -140,7 +139,7 @@ public class UnicopiaCoreClient extends InteractionManager implements ClientModI
@Override
public void onInitializeClient() {
clientPlayerRace = getclientPlayerRace();
UnicopiaCore.interactionManager = this;
InteractionManager.instance = this;
ClientTickCallback.EVENT.register(this::tick);
ClientReadyCallback.EVENT.register(client -> {

1
src/main/java/com/minelittlepony/unicopia/magic/spell/AbstractAttachableSpell.java
View file

@ -6,7 +6,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.minelittlepony.unicopia.entity.SpellcastEntity;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.ICaster;
import net.minecraft.entity.Entity;

5
src/main/java/com/minelittlepony/unicopia/magic/AbstractSpell.java → src/main/java/com/minelittlepony/unicopia/magic/spell/AbstractSpell.java
View file

@ -1,4 +1,7 @@
package com.minelittlepony.unicopia.magic;
package com.minelittlepony.unicopia.magic.spell;
import com.minelittlepony.unicopia.magic.ICaster;
import com.minelittlepony.unicopia.magic.IMagicEffect;
import net.minecraft.nbt.CompoundTag;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/AwkwardSpell.java
View file

@ -5,7 +5,6 @@ import java.util.List;
import javax.annotation.Nullable;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.CastResult;
import com.minelittlepony.unicopia.magic.CasterUtils;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/ChangelingTrapSpell.java
View file

@ -7,7 +7,6 @@ import com.minelittlepony.unicopia.UEntities;
import com.minelittlepony.unicopia.USounds;
import com.minelittlepony.unicopia.entity.CuccoonEntity;
import com.minelittlepony.unicopia.entity.IMagicals;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.CasterUtils;
import com.minelittlepony.unicopia.magic.IAttachedEffect;

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

@ -13,7 +13,6 @@ import com.minelittlepony.unicopia.ability.IFlyingPredicate;
import com.minelittlepony.unicopia.ability.IHeightPredicate;
import com.minelittlepony.unicopia.entity.Owned;
import com.minelittlepony.unicopia.entity.player.IPlayer;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.CasterUtils;
import com.minelittlepony.unicopia.magic.IAttachedEffect;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/FaithfulAssistantSpell.java
View file

@ -4,7 +4,6 @@ import javax.annotation.Nullable;
import com.minelittlepony.unicopia.entity.SpellcastEntity;
import com.minelittlepony.unicopia.entity.ai.FollowCasterGoal;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.ICaster;
import com.minelittlepony.unicopia.magic.IMagicEffect;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/FireSpell.java
View file

@ -4,7 +4,6 @@ import javax.annotation.Nullable;
import com.minelittlepony.unicopia.EquinePredicates;
import com.minelittlepony.unicopia.entity.IMagicals;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.CastResult;
import com.minelittlepony.unicopia.magic.ICaster;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/FlameSpell.java
View file

@ -1,7 +1,6 @@
package com.minelittlepony.unicopia.magic.spell;
import com.minelittlepony.unicopia.entity.player.IPlayer;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.ICaster;
import com.minelittlepony.unicopia.magic.IHeldEffect;

6
src/main/java/com/minelittlepony/unicopia/magic/GenericSpell.java → src/main/java/com/minelittlepony/unicopia/magic/spell/GenericSpell.java
View file

@ -1,7 +1,11 @@
package com.minelittlepony.unicopia.magic;
package com.minelittlepony.unicopia.magic.spell;
import java.util.function.Supplier;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.ICaster;
import com.minelittlepony.unicopia.magic.IMagicEffect;
public class GenericSpell extends AbstractSpell {
private final String name;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/GlowingSpell.java
View file

@ -2,7 +2,6 @@ package com.minelittlepony.unicopia.magic.spell;
import com.minelittlepony.unicopia.entity.player.IPlayer;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.GenericSpell;
import com.minelittlepony.unicopia.magic.ICaster;
import com.minelittlepony.unicopia.magic.IHeldEffect;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/IceSpell.java
View file

@ -3,7 +3,6 @@ package com.minelittlepony.unicopia.magic.spell;
import javax.annotation.Nullable;
import com.minelittlepony.unicopia.UMaterials;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.CastResult;
import com.minelittlepony.unicopia.magic.ICaster;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/NecromancySpell.java
View file

@ -3,7 +3,6 @@ package com.minelittlepony.unicopia.magic.spell;
import java.util.List;
import com.google.common.collect.Lists;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.ICaster;
import com.minelittlepony.unicopia.util.VecHelper;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/PortalSpell.java
View file

@ -10,7 +10,6 @@ import com.minelittlepony.unicopia.SpeciesList;
import com.minelittlepony.unicopia.entity.IMagicals;
import com.minelittlepony.unicopia.entity.SpellcastEntity;
import com.minelittlepony.unicopia.entity.player.IPlayer;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.CastResult;
import com.minelittlepony.unicopia.magic.ICaster;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/RevealingSpell.java
View file

@ -1,7 +1,6 @@
package com.minelittlepony.unicopia.magic.spell;
import com.minelittlepony.unicopia.UParticles;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.ICaster;
import com.minelittlepony.unicopia.magic.ISuppressable;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/ShieldSpell.java
View file

@ -7,7 +7,6 @@ import com.minelittlepony.unicopia.EquinePredicates;
import com.minelittlepony.unicopia.SpeciesList;
import com.minelittlepony.unicopia.UParticles;
import com.minelittlepony.unicopia.entity.player.IPlayer;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.IAttachedEffect;
import com.minelittlepony.unicopia.magic.ICaster;

1
src/main/java/com/minelittlepony/unicopia/magic/spell/SiphoningSpell.java
View file

@ -6,7 +6,6 @@ import java.util.stream.Collectors;
import com.minelittlepony.unicopia.Race;
import com.minelittlepony.unicopia.SpeciesList;
import com.minelittlepony.unicopia.entity.player.IPlayer;
import com.minelittlepony.unicopia.magic.AbstractSpell;
import com.minelittlepony.unicopia.magic.Affinity;
import com.minelittlepony.unicopia.magic.ICaster;
import com.minelittlepony.unicopia.util.MagicalDamageSource;