PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement sugar, implement spell affinities, fix some issues with the ice gem

Browse source
This commit is contained in:
Sollace 2019-01-22 18:39:30 +02:00
parent cd0b86fc36
commit 35851d3f23
34 changed files with 486 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/UItems.java
View file

@ -115,8 +115,8 @@ public class UItems {
.setTranslationKey("alfalfa_leaves")
.setRegistryName(Unicopia.MODID, "alfalfa_leaves");
public static final Item cereal = new ItemCereal(Unicopia.MODID, "cereal", 9, 0.8F);
public static final Item sugar_cereal = new ItemCereal(Unicopia.MODID, "sugar_cereal", 20, -2).setAlwaysEdible();
public static final Item cereal = new ItemCereal(Unicopia.MODID, "cereal", 9, 0.8F).setSugarAmount(1);
public static final Item sugar_cereal = new ItemCereal(Unicopia.MODID, "sugar_cereal", 20, -2).setSugarAmount(110).setAlwaysEdible();
public static final ItemTomato tomato = new ItemTomato(Unicopia.MODID, "tomato", 4, 34);
public static final ItemTomato cloudsdale_tomato = new ItemTomato(Unicopia.MODID, "cloudsdale_tomato", 16, 4);

13
src/main/java/com/minelittlepony/unicopia/Unicopia.java
View file

@ -65,6 +65,7 @@ import com.minelittlepony.unicopia.network.MsgPlayerAbility;
import com.minelittlepony.unicopia.network.MsgPlayerCapabilities;
import com.minelittlepony.unicopia.network.MsgRequestCapabilities;
import com.minelittlepony.unicopia.player.IPlayer;
import com.minelittlepony.unicopia.player.IView;
import com.minelittlepony.unicopia.player.PlayerSpeciesList;
import com.minelittlepony.unicopia.power.PowersRegistry;
import com.minelittlepony.unicopia.util.crafting.CraftingManager;
@ -205,7 +206,11 @@ public class Unicopia implements IGuiHandler {
EntityPlayer player = Minecraft.getMinecraft().player;
if (player != null) {
event.setRoll((float)PlayerSpeciesList.instance().getPlayer(player).getCamera().calculateRoll(player));
IView view = PlayerSpeciesList.instance().getPlayer(player).getCamera();
event.setRoll(view.calculateRoll());
event.setPitch(view.calculatePitch(event.getPitch()));
event.setYaw(view.calculateYaw(event.getYaw()));
}
}
@ -322,11 +327,7 @@ public class Unicopia implements IGuiHandler {
@SubscribeEvent
public static void modifyFOV(FOVUpdateEvent event) {
float fov = event.getFov();
fov += PlayerSpeciesList.instance().getPlayer(event.getEntity()).getExertion() / 5;
event.setNewfov(fov);
event.setNewfov(PlayerSpeciesList.instance().getPlayer(event.getEntity()).getCamera().calculateFieldOfView(event.getFov()));
}
@Override

14
src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java
View file

@ -8,6 +8,7 @@ import com.minelittlepony.unicopia.item.ICastable;
import com.minelittlepony.unicopia.network.EffectSync;
import com.minelittlepony.unicopia.spell.ICaster;
import com.minelittlepony.unicopia.spell.IMagicEffect;
import com.minelittlepony.unicopia.spell.SpellAffinity;
import com.minelittlepony.unicopia.spell.SpellRegistry;
import net.minecraft.block.SoundType;
@ -45,6 +46,9 @@ public class EntitySpell extends EntityLiving implements IMagicals, ICaster<Enti
private static final DataParameter<NBTTagCompound> EFFECT = EntityDataManager
.createKey(EntitySpell.class, DataSerializers.COMPOUND_TAG);
private static final DataParameter<Integer> AFFINITY = EntityDataManager
.createKey(EntitySpell.class, DataSerializers.VARINT);
private final EffectSync<EntityLivingBase> effectDelegate = new EffectSync<>(this, EFFECT);
public EntitySpell(World w) {
@ -64,6 +68,15 @@ public class EntitySpell extends EntityLiving implements IMagicals, ICaster<Enti
return super.isInRangeToRenderDist(distance);
}
@Override
public SpellAffinity getAffinity() {
return SpellAffinity.values()[dataManager.get(AFFINITY)];
}
public void setAffinity(SpellAffinity affinity) {
dataManager.set(AFFINITY, affinity.ordinal());
}
@Override
public void setEffect(IMagicEffect effect) {
effectDelegate.set(effect);
@ -80,6 +93,7 @@ public class EntitySpell extends EntityLiving implements IMagicals, ICaster<Enti
dataManager.register(LEVEL, 0);
dataManager.register(EFFECT, new NBTTagCompound());
dataManager.register(OWNER, "");
dataManager.register(AFFINITY, SpellAffinity.NEUTRAL.ordinal());
}
public ItemStack onPlayerMiddleClick(EntityPlayer player) {

2
src/main/java/com/minelittlepony/unicopia/forgebullshit/ICapabilitiesProxyContainer.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.unicopia.forgebullshit;
import com.minelittlepony.unicopia.InbtSerialisable;
import com.minelittlepony.unicopia.player.IPlayer;
import com.minelittlepony.unicopia.player.IRaceContainer;
import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
import net.minecraft.entity.Entity;

2
src/main/java/com/minelittlepony/unicopia/inventory/InventoryOfHolding.java
View file

@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.BiFunction;
import com.minelittlepony.unicopia.InbtSerialisable;
import com.minelittlepony.unicopia.advancements.UAdvancements;
import com.minelittlepony.unicopia.item.IMagicalItem;
import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
import com.minelittlepony.util.MagicalDamageSource;
import net.minecraft.block.Block;

13
src/main/java/com/minelittlepony/unicopia/item/ICastable.java
View file

@ -20,4 +20,17 @@ public interface ICastable extends IMagicalItem {
boolean canFeed(EntitySpell spell, ItemStack stack);
/**
* Called to cast a spell. The result is an entity spawned with the spell attached.
*/
default EntitySpell castContainedSpell(World world, BlockPos pos, ItemStack stack, IMagicEffect effect) {
EntitySpell spell = new EntitySpell(world);
spell.setAffinity(getAffinity(stack));
spell.setEffect(effect);
spell.setLocationAndAngles(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0);
world.spawnEntity(spell);
return spell;
}
}

12
src/main/java/com/minelittlepony/unicopia/item/IMagicalItem.java
View file

@ -1,5 +1,9 @@
package com.minelittlepony.unicopia.item;
import com.minelittlepony.unicopia.spell.SpellAffinity;
import net.minecraft.item.ItemStack;
public interface IMagicalItem {
/**
* If true this item serves as host to its own inner dimensional space.
@ -8,4 +12,12 @@ public interface IMagicalItem {
default boolean hasInnerSpace() {
return false;
}
/**
* Gets the affinity of this magical artifact. Either good, bad, or unaligned.
* What this returns may have effects on the behaviour of certain spells and effects.
*/
default SpellAffinity getAffinity(ItemStack stack) {
return SpellAffinity.NEUTRAL;
}
}

21
src/main/java/com/minelittlepony/unicopia/item/ItemCereal.java
View file

@ -1,6 +1,9 @@
package com.minelittlepony.unicopia.item;
import com.minelittlepony.unicopia.player.PlayerSpeciesList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
@ -8,6 +11,8 @@ import net.minecraft.world.World;
public class ItemCereal extends ItemFood {
private int sugarAmount;
public ItemCereal(String domain, String name, int amount, float saturation) {
super(amount, saturation, false);
@ -19,8 +24,20 @@ public class ItemCereal extends ItemFood {
public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) {
super.onItemUseFinish(stack, worldIn, entityLiving);
this.setAlwaysEdible();
return new ItemStack(Items.BOWL);
}
@Override
protected void onFoodEaten(ItemStack stack, World worldIn, EntityPlayer player) {
super.onFoodEaten(stack, worldIn, player);
if (sugarAmount != 0) {
PlayerSpeciesList.instance().getPlayer(player).addEnergy(sugarAmount);
}
}
public ItemCereal setSugarAmount(int sugar) {
sugarAmount = sugar;
return this;
}
}

6
src/main/java/com/minelittlepony/unicopia/item/ItemCurse.java
View file

@ -2,6 +2,7 @@ package com.minelittlepony.unicopia.item;
import com.minelittlepony.unicopia.spell.IDispenceable;
import com.minelittlepony.unicopia.spell.IMagicEffect;
import com.minelittlepony.unicopia.spell.SpellAffinity;
import com.minelittlepony.unicopia.spell.SpellCastResult;
import com.minelittlepony.util.MagicalDamageSource;
@ -49,4 +50,9 @@ public class ItemCurse extends ItemSpell {
return result;
}
@Override
public SpellAffinity getAffinity(ItemStack stack) {
return SpellAffinity.BAD;
}
}

10
src/main/java/com/minelittlepony/unicopia/item/ItemOfHolding.java
View file

@ -125,6 +125,11 @@ public class ItemOfHolding extends Item implements IMagicalItem {
return new ActionResult<>(EnumActionResult.SUCCESS, stack);
}
@Override
public boolean hasInnerSpace() {
return true;
}
public class Inventory implements IInteractionObject {
private String customname = null;
@ -163,9 +168,4 @@ public class ItemOfHolding extends Item implements IMagicalItem {
return "unicopia:itemofholding";
}
}
@Override
public boolean hasInnerSpace() {
return true;
}
}

98
src/main/java/com/minelittlepony/unicopia/item/ItemSpell.java
View file

@ -1,21 +1,29 @@
package com.minelittlepony.unicopia.item;
import java.util.List;
import javax.annotation.Nullable;
import com.minelittlepony.unicopia.Predicates;
import com.minelittlepony.unicopia.entity.EntitySpell;
import com.minelittlepony.unicopia.spell.IMagicEffect;
import com.minelittlepony.unicopia.spell.IUseAction;
import com.minelittlepony.unicopia.spell.SpellAffinity;
import com.minelittlepony.unicopia.spell.SpellCastResult;
import com.minelittlepony.unicopia.spell.IDispenceable;
import com.minelittlepony.unicopia.spell.SpellRegistry;
import com.minelittlepony.util.vector.VecHelper;
import net.minecraft.block.BlockDispenser;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
import net.minecraft.dispenser.IBehaviorDispenseItem;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
@ -37,24 +45,28 @@ public class ItemSpell extends Item implements ICastable {
return super.dispenseStack(source, stack);
}
SpellCastResult dispenceResult = ((ICastable)stack.getItem()).onDispenseSpell(source, stack, effect);
if (stack.getItem() instanceof ICastable) {
ICastable castable = (ICastable)stack.getItem();
if (dispenceResult == SpellCastResult.DEFAULT) {
return super.dispenseStack(source, stack);
}
SpellCastResult dispenceResult = castable.onDispenseSpell(source, stack, effect);
if (dispenceResult == SpellCastResult.PLACE) {
BlockPos pos = source.getBlockPos();
if (dispenceResult == SpellCastResult.DEFAULT) {
return super.dispenseStack(source, stack);
}
castContainedSpell(source.getWorld(), pos, stack, effect);
if (dispenceResult == SpellCastResult.PLACE) {
castable.castContainedSpell(source.getWorld(), source.getBlockPos(), stack, effect);
stack.shrink(1);
stack.shrink(1);
}
}
return stack;
}
};
protected String translationKey;
public ItemSpell(String domain, String name) {
super();
@ -69,6 +81,11 @@ public class ItemSpell extends Item implements ICastable {
BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(this, dispenserBehavior);
}
public Item setTranslationKey(String key) {
translationKey = key;
return super.setTranslationKey(key);
}
@Override
public boolean hasEffect(ItemStack stack) {
return SpellRegistry.stackHasEnchantment(stack);
@ -79,13 +96,13 @@ public class ItemSpell extends Item implements ICastable {
EnumFacing facing = source.getBlockState().getValue(BlockDispenser.FACING);
BlockPos pos = source.getBlockPos().offset(facing);
return effect.onDispenced(pos, facing, source);
return effect.onDispenced(pos, facing, source, getAffinity(stack));
}
@Override
public SpellCastResult onCastSpell(EntityPlayer player, World world, BlockPos pos, ItemStack stack, IMagicEffect effect, EnumFacing side, float hitX, float hitY, float hitZ) {
if (effect instanceof IUseAction) {
return ((IUseAction)effect).onUse(stack, player, world, pos, side, hitX, hitY, hitZ);
return ((IUseAction)effect).onUse(stack, getAffinity(stack), player, world, pos, side, hitX, hitY, hitZ);
}
return SpellCastResult.PLACE;
@ -110,7 +127,7 @@ public class ItemSpell extends Item implements ICastable {
return EnumActionResult.FAIL;
}
SpellCastResult result = ((ICastable)stack.getItem()).onCastSpell(player, world, pos, stack, effect, side, hitX, hitY, hitZ);
SpellCastResult result = onCastSpell(player, world, pos, stack, effect, side, hitX, hitY, hitZ);
if (!world.isRemote) {
pos = pos.offset(side);
@ -146,10 +163,10 @@ public class ItemSpell extends Item implements ICastable {
return new ActionResult<ItemStack>(EnumActionResult.FAIL, stack);
}
IMagicEffect effect = SpellRegistry.instance().getSpellFromItemStack(stack);
IUseAction effect = SpellRegistry.instance().getUseActionFrom(stack);
if (effect instanceof IUseAction) {
SpellCastResult result = ((IUseAction)effect).onUse(stack, player, world, target);
if (effect != null) {
SpellCastResult result = effect.onUse(stack, getAffinity(stack), player, world, target);
if (result != SpellCastResult.NONE) {
if (result == SpellCastResult.PLACE && !player.capabilities.isCreativeMode) {
@ -163,6 +180,35 @@ public class ItemSpell extends Item implements ICastable {
return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
}
@Override
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
if (SpellRegistry.stackHasEnchantment(stack)) {
SpellAffinity affinity = getAffinity(stack);
tooltip.add(affinity.getColourCode() + I18n.format(String.format("%s.%s.name",
affinity.getTranslationKey(),
SpellRegistry.getKeyFromStack(stack)
)));
}
}
@Override
public String getTranslationKey(ItemStack stack) {
return super.getTranslationKey();
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
if (SpellRegistry.stackHasEnchantment(stack)) {
return I18n.format(getTranslationKey(stack) + ".enchanted.name", I18n.format(String.format("%s.%s.name",
getAffinity(stack).getTranslationKey(),
SpellRegistry.getKeyFromStack(stack)
)));
}
return super.getItemStackDisplayName(stack);
}
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems) {
super.getSubItems(tab, subItems);
@ -175,31 +221,23 @@ public class ItemSpell extends Item implements ICastable {
}
@Override
public String getTranslationKey(ItemStack stack) {
String result = super.getTranslationKey(stack);
public EnumRarity getRarity(ItemStack stack) {
if (SpellRegistry.stackHasEnchantment(stack)) {
result += "." + stack.getTagCompound().getString("spell");
return EnumRarity.UNCOMMON;
}
return result;
}
protected static EntitySpell castContainedSpell(World world, BlockPos pos, ItemStack stack, IMagicEffect effect) {
EntitySpell spell = new EntitySpell(world);
spell.setEffect(effect);
spell.setLocationAndAngles(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0);
world.spawnEntity(spell);
return spell;
return super.getRarity(stack);
}
@Override
public boolean canFeed(EntitySpell entity, ItemStack stack) {
IMagicEffect effect = entity.getEffect();
return effect != null && effect.getName().equals(SpellRegistry.getKeyFromStack(stack));
}
@Override
public SpellAffinity getAffinity(ItemStack stack) {
return SpellAffinity.GOOD;
}
}

4
src/main/java/com/minelittlepony/unicopia/model/ModelGem.java
View file

@ -2,7 +2,6 @@ package com.minelittlepony.unicopia.model;
import com.minelittlepony.render.model.ModelQuads;
import com.minelittlepony.unicopia.entity.EntitySpell;
import com.minelittlepony.unicopia.spell.SpellRegistry;
import com.minelittlepony.util.render.Color;
import com.minelittlepony.util.render.Vertex;
@ -105,8 +104,7 @@ public class ModelGem extends ModelBase {
setLightingConditionsBrightness(0xF0F0);
Color.glColor(SpellRegistry.instance().getSpellTint(spell.getEffect().getName()), 1);
Color.glColor(spell.getEffect().getTint(), 1);
int tiers = Math.min(spell.getCurrentLevel(), 5);

8
src/main/java/com/minelittlepony/unicopia/player/IPlayer.java
View file

@ -30,6 +30,14 @@ public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPla
setExertion(getExertion() + exertion/100F);
}
float getEnergy();
void setEnergy(float energy);
default void addEnergy(int energy) {
setEnergy(getEnergy() + energy / 100F);
}
boolean isClientPlayer();
void copyFrom(IPlayer oldPlayer);

2
src/main/java/com/minelittlepony/unicopia/player/IRaceContainer.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.unicopia.player;
import com.minelittlepony.unicopia.InbtSerialisable;
import com.minelittlepony.unicopia.Race;
import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
import net.minecraft.entity.Entity;

10
src/main/java/com/minelittlepony/unicopia/player/IView.java
View file

@ -1,9 +1,13 @@
package com.minelittlepony.unicopia.player;
import net.minecraft.entity.player.EntityPlayer;
public interface IView {
double calculateRoll(EntityPlayer player);
float calculateRoll();
float calculatePitch(float pitch);
float calculateYaw(float yaw);
float calculateFieldOfView(float initialfow);
double getBaseRoll();

2
src/main/java/com/minelittlepony/unicopia/player/PlayerAbilityDelegate.java
View file

@ -1,12 +1,12 @@
package com.minelittlepony.unicopia.player;
import com.minelittlepony.jumpingcastle.api.Target;
import com.minelittlepony.unicopia.InbtSerialisable;
import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.unicopia.network.MsgPlayerAbility;
import com.minelittlepony.unicopia.power.IData;
import com.minelittlepony.unicopia.power.IPower;
import com.minelittlepony.unicopia.power.PowersRegistry;
import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;

26
src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java
View file

@ -12,8 +12,8 @@ import com.minelittlepony.unicopia.UClient;
import com.minelittlepony.unicopia.Unicopia;
import com.minelittlepony.unicopia.network.EffectSync;
import com.minelittlepony.unicopia.network.MsgPlayerCapabilities;
import com.minelittlepony.unicopia.spell.ICaster;
import com.minelittlepony.unicopia.spell.IMagicEffect;
import com.minelittlepony.unicopia.spell.SpellAffinity;
import com.minelittlepony.unicopia.spell.SpellRegistry;
import net.minecraft.client.Minecraft;
@ -30,13 +30,13 @@ import net.minecraft.network.play.server.SPacketSetPassengers;
import net.minecraft.potion.PotionEffect;
import net.minecraft.stats.StatList;
class PlayerCapabilities implements IPlayer, ICaster<EntityPlayer> {
class PlayerCapabilities implements IPlayer {
private static final DataParameter<Integer> PLAYER_RACE = EntityDataManager
.createKey(EntityPlayer.class, DataSerializers.VARINT);
private static final DataParameter<Integer> ENERGY = EntityDataManager
.createKey(EntityPlayer.class, DataSerializers.VARINT);
private static final DataParameter<Float> ENERGY = EntityDataManager
.createKey(EntityPlayer.class, DataSerializers.FLOAT);
private static final DataParameter<Float> EXERTION = EntityDataManager
.createKey(EntityPlayer.class, DataSerializers.FLOAT);
@ -67,8 +67,8 @@ class PlayerCapabilities implements IPlayer, ICaster<EntityPlayer> {
player.getDataManager().register(PLAYER_RACE, Race.HUMAN.ordinal());
player.getDataManager().register(EXERTION, 0F);
player.getDataManager().register(ENERGY, 0F);
player.getDataManager().register(EFFECT, new NBTTagCompound());
player.getDataManager().register(ENERGY, 0);
}
@Override
@ -107,6 +107,21 @@ class PlayerCapabilities implements IPlayer, ICaster<EntityPlayer> {
getOwner().getDataManager().set(EXERTION, Math.max(0, exertion));
}
@Override
public float getEnergy() {
return getOwner().getDataManager().get(ENERGY);
}
@Override
public void setEnergy(float energy) {
getOwner().getDataManager().set(ENERGY, Math.max(0, energy));
}
@Override
public SpellAffinity getAffinity() {
return SpellAffinity.NEUTRAL;
}
@Override
public void sendCapabilities(boolean full) {
if (!getOwner().getEntityWorld().isRemote) {
@ -182,6 +197,7 @@ class PlayerCapabilities implements IPlayer, ICaster<EntityPlayer> {
}
addExertion(-1);
addEnergy(-1);
attributes.applyAttributes(entity, getPlayerSpecies());
}

2
src/main/java/com/minelittlepony/unicopia/player/PlayerGravityDelegate.java
View file

@ -1,8 +1,8 @@
package com.minelittlepony.unicopia.player;
import com.minelittlepony.unicopia.InbtSerialisable;
import com.minelittlepony.unicopia.USounds;
import com.minelittlepony.unicopia.mixin.MixinEntity;
import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;

42
src/main/java/com/minelittlepony/unicopia/player/PlayerView.java
View file

@ -2,8 +2,6 @@ package com.minelittlepony.unicopia.player;
import com.minelittlepony.transform.MotionCompositor;
import net.minecraft.entity.player.EntityPlayer;
class PlayerView extends MotionCompositor implements IView {
private final IPlayer player;
@ -15,15 +13,49 @@ class PlayerView extends MotionCompositor implements IView {
}
@Override
public double calculateRoll(EntityPlayer entity) {
public float calculateRoll() {
double roll = baseRoll;
if (player.getGravity().isFlying()) {
roll -= super.calculateRoll(entity, entity.motionX, entity.motionY, entity.motionZ);
roll -= super.calculateRoll(player.getOwner(), player.getOwner().motionX, player.getOwner().motionY, player.getOwner().motionZ);
}
return player.getInterpolator().interpolate("roll", (float)roll, 100);
return (float)player.getInterpolator().interpolate("roll", (float)roll, 100);
}
@Override
public float calculatePitch(float pitch) {
return pitch + getEnergyAddition();
}
@Override
public float calculateYaw(float yaw) {
return yaw + getEnergyAddition();
}
@Override
public float calculateFieldOfView(float fov) {
fov += player.getExertion() / 5;
fov += getEnergyAddition();
return fov;
}
protected float getEnergyAddition() {
int maxE = (int)Math.floor(player.getEnergy() * 100);
if (maxE <= 0) {
return 0;
}
float energyAddition = (player.getWorld().rand.nextInt(maxE) - maxE/2) / 100F;
if (Math.abs(energyAddition) <= 0.001) {
return 0;
}
return energyAddition;
}
@Override

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

@ -4,6 +4,16 @@ public abstract class AbstractSpell implements IMagicEffect {
protected boolean isDead = false;
@Override
public int getCurrentLevel() {
return 0;
}
@Override
public void setCurrentLevel(int level) {
}
@Override
public void setDead() {
isDead = true;

3
src/main/java/com/minelittlepony/unicopia/spell/ICaster.java
View file

@ -15,10 +15,13 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
public interface ICaster<E extends EntityLivingBase> extends IOwned<E>, ILevelled {
void setEffect(IMagicEffect effect);
IMagicEffect getEffect();
SpellAffinity getAffinity();
default boolean hasEffect() {
return getEffect() != null;
}

3
src/main/java/com/minelittlepony/unicopia/spell/IDispenceable.java
View file

@ -16,7 +16,8 @@ public interface IDispenceable extends IMagicEffect {
* @param pos Block position in front of the dispenser
* @param facing Direction of the dispenser
* @param source The dispenser currently dispensing
* @param affinity The affinity of the casting artifact
* @return an ActionResult for the type of action to perform.
*/
public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source);
public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source, SpellAffinity affinity);
}

13
src/main/java/com/minelittlepony/unicopia/spell/IMagicEffect.java
View file

@ -1,14 +1,22 @@
package com.minelittlepony.unicopia.spell;
import com.minelittlepony.unicopia.InbtSerialisable;
import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
/**
* Interface for a magic spells
*/
public interface IMagicEffect extends InbtSerialisable, ILevelled {
/**
* Gets the name used to identify this effect.
*/
String getName();
/**
* Gets the tint for this spell when applied to a gem.
*/
int getTint();
/**
* Sets this effect as dead.
*/
@ -30,7 +38,8 @@ public interface IMagicEffect extends InbtSerialisable, ILevelled {
}
/**
* Called every tick when attached to a gem.
* Called every tick when attached to an entity.
* Called on both sides.
*
* @param source The entity we are currently attached to.
* @param level Current active spell level

6
src/main/java/com/minelittlepony/unicopia/spell/IUseAction.java
View file

@ -19,6 +19,7 @@ public interface IUseAction {
* Triggered when the player right clicks a block
*
* @param stack The current itemstack
* @param affinity The affinity of the casting artifact
* @param player The player
* @param world The player's world
* @param pos The location clicked
@ -29,17 +30,18 @@ public interface IUseAction {
*
* @return ActionResult for the type of action to perform
*/
public SpellCastResult onUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ);
public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ);
/**
* Triggered when the player right clicks
*
* @param stack The current itemstack
* @param affinity The affinity of the casting artifact
* @param player The player
* @param world The player's world
* @param hitEntity The entity in focus, if any
*
* @return ActionResult for the type of action to perform
*/
public SpellCastResult onUse(ItemStack stack, EntityPlayer player, World world, @Nonnull Entity hitEntity);
public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, @Nonnull Entity hitEntity);
}

34
src/main/java/com/minelittlepony/unicopia/spell/SpellAffinity.java Normal file
View file

@ -0,0 +1,34 @@
package com.minelittlepony.unicopia.spell;
import net.minecraft.util.text.TextFormatting;
public enum SpellAffinity {
GOOD(TextFormatting.BLUE, -1),
NEUTRAL(TextFormatting.WHITE, 0),
BAD(TextFormatting.RED, 1);
private final TextFormatting color;
private final int corruption;
SpellAffinity(TextFormatting color, int corruption) {
this.color = color;
this.corruption = corruption;
}
public TextFormatting getColourCode() {
return color;
}
public String getTranslationKey() {
return this == BAD ? "curse" : "spell";
}
public int getCorruption() {
return corruption;
}
public boolean isNeutral() {
return this == NEUTRAL;
}
}

5
src/main/java/com/minelittlepony/unicopia/spell/SpellCharge.java
View file

@ -33,6 +33,11 @@ public class SpellCharge extends AbstractSpell {
return "charge";
}
@Override
public int getTint() {
return 0x0000AA;
}
@Override
public void render(ICaster<?> source, int level) {
if (source.getWorld().rand.nextInt(4 + level * 4) == 0) {

22
src/main/java/com/minelittlepony/unicopia/spell/SpellFire.java
View file

@ -68,21 +68,16 @@ public class SpellFire extends AbstractSpell implements IUseAction, IDispenceabl
: s));
}
@Override
public int getCurrentLevel() {
return 0;
}
@Override
public void setCurrentLevel(int level) {
}
@Override
public String getName() {
return "fire";
}
@Override
public int getTint() {
return 0xFF0000;
}
@Override
public boolean update(ICaster<?> source, int level) {
return false;
@ -90,14 +85,13 @@ public class SpellFire extends AbstractSpell implements IUseAction, IDispenceabl
@Override
public void render(ICaster<?> source, int level) {
source.spawnParticles(visual_effect_region, level * 6, pos -> {
source.getWorld().spawnParticle(EnumParticleTypes.SMOKE_LARGE, pos.x, pos.y, pos.z, 0, 0, 0);
});
}
@Override
public SpellCastResult onUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
boolean result = false;
if (player == null || player.isSneaking()) {
@ -117,12 +111,12 @@ public class SpellFire extends AbstractSpell implements IUseAction, IDispenceabl
}
@Override
public SpellCastResult onUse(ItemStack stack, EntityPlayer player, World world, @Nonnull Entity hitEntity) {
public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, @Nonnull Entity hitEntity) {
return applyEntitySingle(player, world, hitEntity) ? SpellCastResult.DEFAULT : SpellCastResult.NONE;
}
@Override
public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source) {
public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source, SpellAffinity affinity) {
pos = pos.offset(facing, 4);
boolean result = false;

75
src/main/java/com/minelittlepony/unicopia/spell/SpellIce.java
View file

@ -5,6 +5,7 @@ import com.minelittlepony.util.MagicalDamageSource;
import com.minelittlepony.util.PosHelper;
import com.minelittlepony.util.blockstate.IStateMapping;
import com.minelittlepony.util.blockstate.StateMapList;
import com.minelittlepony.util.shape.IShape;
import com.minelittlepony.util.shape.Sphere;
import com.minelittlepony.util.vector.VecHelper;
@ -29,9 +30,9 @@ import net.minecraft.world.World;
public class SpellIce extends AbstractSpell implements IUseAction, IDispenceable {
public static final StateMapList affected = new StateMapList();
public final StateMapList affected = new StateMapList();
static {
public SpellIce() {
affected.add(IStateMapping.build(
s -> s.getMaterial() == Material.WATER,
s -> Blocks.ICE.getDefaultState()));
@ -40,27 +41,31 @@ public class SpellIce extends AbstractSpell implements IUseAction, IDispenceable
s -> Blocks.OBSIDIAN.getDefaultState()));
affected.add(IStateMapping.build(
s -> s.getBlock() == Blocks.SNOW_LAYER,
s -> s.cycleProperty(BlockSnow.LAYERS)));
s -> {
s = s.cycleProperty(BlockSnow.LAYERS);
if (s.getValue(BlockSnow.LAYERS) >= 7) {
return Blocks.SNOW.getDefaultState();
}
return s;
}));
affected.replaceBlock(Blocks.FIRE, Blocks.AIR);
affected.setProperty(Blocks.REDSTONE_WIRE, BlockRedstoneWire.POWER, 0);
}
protected int rad = 3;
@Override
public int getCurrentLevel() {
return 0;
}
@Override
public void setCurrentLevel(int level) {
}
private final int rad = 3;
private final IShape effect_range = new Sphere(false, rad);
@Override
public String getName() {
return "ice";
}
@Override
public int getTint() {
return 0xADD8E6;
}
@Override
public boolean update(ICaster<?> source, int level) {
return false;
@ -71,12 +76,12 @@ public class SpellIce extends AbstractSpell implements IUseAction, IDispenceable
}
@Override
public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source) {
public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source, SpellAffinity affinity) {
return applyBlocks(null, source.getWorld(), pos.offset(facing, rad)) ? SpellCastResult.NONE : SpellCastResult.DEFAULT;
}
@Override
public SpellCastResult onUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
if (player != null && player.isSneaking()) {
applyBlockSingle(world, pos);
} else {
@ -87,9 +92,8 @@ public class SpellIce extends AbstractSpell implements IUseAction, IDispenceable
}
@Override
public SpellCastResult onUse(ItemStack stack, EntityPlayer player, World world, Entity hitEntity) {
if (hitEntity != null) {
applyEntitySingle(player, hitEntity);
public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, Entity hitEntity) {
if (hitEntity != null && applyEntitySingle(player, hitEntity)) {
return SpellCastResult.DEFAULT;
}
@ -98,7 +102,7 @@ public class SpellIce extends AbstractSpell implements IUseAction, IDispenceable
private boolean applyBlocks(EntityPlayer owner, World world, BlockPos pos) {
for (BlockPos i : PosHelper.getAllInRegionMutable(pos, new Sphere(false, rad))) {
for (BlockPos i : PosHelper.getAllInRegionMutable(pos, effect_range)) {
applyBlockSingle(world, i);
}
@ -106,24 +110,23 @@ public class SpellIce extends AbstractSpell implements IUseAction, IDispenceable
}
protected boolean applyEntities(EntityPlayer owner, World world, BlockPos pos) {
return VecHelper.findAllEntitiesInRange(owner, world, pos, 3).filter(i -> {
applyEntitySingle(owner, i);
return true;
}).count() > 0;
return VecHelper.findAllEntitiesInRange(owner, world, pos, 3).filter(i ->
applyEntitySingle(owner, i)
).count() > 0;
}
protected void applyEntitySingle(EntityPlayer owner, Entity e) {
protected boolean applyEntitySingle(EntityPlayer owner, Entity e) {
if (e instanceof EntityTNTPrimed) {
e.setDead();
e.getEntityWorld().setBlockState(e.getPosition(), Blocks.TNT.getDefaultState());
} else if (e.isBurning()) {
e.extinguish();
} else {
if (e.isBurning()) {
e.extinguish();
} else {
DamageSource d = MagicalDamageSource.causePlayerDamage("cold", owner);
e.attackEntityFrom(d, 2);
}
DamageSource d = MagicalDamageSource.causePlayerDamage("cold", owner);
e.attackEntityFrom(d, 2);
}
return true;
}
private void applyBlockSingle(World world, BlockPos pos) {
@ -138,7 +141,7 @@ public class SpellIce extends AbstractSpell implements IUseAction, IDispenceable
|| (id == Blocks.SNOW)
|| (id instanceof BlockLeaves)) {
incrementIce(world, pos.up());
} else if (id == Blocks.ICE && world.rand.nextInt(10) == 0) {
} else if (state.getMaterial() == Material.ICE && world.rand.nextInt(10) == 0) {
if (isSurroundedByIce(world, pos)) {
world.setBlockState(pos, Blocks.PACKED_ICE.getDefaultState());
}
@ -148,13 +151,9 @@ public class SpellIce extends AbstractSpell implements IUseAction, IDispenceable
}
public static boolean isSurroundedByIce(World w, BlockPos pos) {
return isIce(w, pos.up()) && isIce(w, pos.down()) &&
isIce(w, pos.north()) && isIce(w, pos.south()) &&
isIce(w, pos.east()) && isIce(w, pos.west());
}
public static boolean isIce(World world, BlockPos pos) {
return world.getBlockState(pos).getMaterial() == Material.ICE;
return !PosHelper.adjacentNeighbours(pos).stream().anyMatch(i ->
w.getBlockState(i).getMaterial() == Material.ICE
);
}
private void incrementIce(World world, BlockPos pos) {

40
src/main/java/com/minelittlepony/unicopia/spell/SpellRegistry.java
View file

@ -6,6 +6,7 @@ import java.util.Set;
import java.util.concurrent.Callable;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -25,10 +26,10 @@ public class SpellRegistry {
private final Map<String, Entry> entries = new HashMap<>();
private SpellRegistry() {
registerSpell("shield", 0x66CDAA, SpellShield::new);
registerSpell("charge", 0x0000AA, SpellCharge::new);
registerSpell("fire", 0xFF0000, SpellFire::new);
registerSpell("ice", 0xADD8E6, SpellIce::new);
registerSpell(SpellShield::new);
registerSpell(SpellCharge::new);
registerSpell(SpellFire::new);
registerSpell(SpellIce::new);
}
public IMagicEffect getSpellFromName(String name) {
@ -61,6 +62,7 @@ public class SpellRegistry {
return compound;
}
@Nullable
public IDispenceable getDispenseActionFrom(ItemStack stack) {
String key = getKeyFromStack(stack);
@ -74,13 +76,27 @@ public class SpellRegistry {
return null;
}
@Nullable
public IUseAction getUseActionFrom(ItemStack stack) {
String key = getKeyFromStack(stack);
if (entries.containsKey(key)) {
Entry entry = entries.get(key);
if (entry.canUse) {
return entry.create();
}
}
return null;
}
public IMagicEffect getSpellFromItemStack(ItemStack stack) {
return getSpellFromName(getKeyFromStack(stack));
}
public void registerSpell(String key, int tint, Callable<IMagicEffect> factory) {
public void registerSpell(Callable<IMagicEffect> factory) {
try {
entries.put(key, new Entry(factory, tint));
new Entry(factory);
} catch (Exception e) {
e.printStackTrace();
}
@ -143,11 +159,17 @@ public class SpellRegistry {
int color;
boolean canDispense;
boolean canUse;
Entry(Callable<IMagicEffect> factory) throws Exception {
IMagicEffect inst = factory.call();
Entry(Callable<IMagicEffect> factory, int color) throws Exception {
this.factory = factory;
this.color = color;
this.canDispense = factory.call() instanceof IDispenceable;
this.color = inst.getTint();
this.canDispense = inst instanceof IDispenceable;
this.canUse = inst instanceof IUseAction;
entries.put(inst.getName(), this);
}
@SuppressWarnings("unchecked")

5
src/main/java/com/minelittlepony/unicopia/spell/SpellShield.java
View file

@ -36,6 +36,11 @@ public class SpellShield extends AbstractSpell {
return "shield";
}
@Override
public int getTint() {
return 0x66CDAA;
}
@Override
public int getMaxLevel() {
return 17;

2
src/main/java/com/minelittlepony/unicopia/InbtSerialisable.java → src/main/java/com/minelittlepony/unicopia/util/serialisation/InbtSerialisable.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.unicopia;
package com.minelittlepony.unicopia.util.serialisation;
import net.minecraft.nbt.NBTTagCompound;

65
src/main/java/com/minelittlepony/util/Iterators.java Normal file
View file

@ -0,0 +1,65 @@
package com.minelittlepony.util;
import java.util.function.Supplier;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import com.google.common.collect.AbstractIterator;
public interface Iterators<T> extends Iterable<T> {
static <T> Iterators<T> iterate(Supplier<T> producer) {
return () -> new AbstractIterator<T>() {
@Override
protected T computeNext() {
T next = producer.get();
if (next == null) {
endOfData();
}
return next;
}
};
}
/**
* Returns a sequential {@code Stream} with this collection as its source.
*
* <p>This method should be overridden when the {@link #spliterator()}
* method cannot return a spliterator that is {@code IMMUTABLE},
* {@code CONCURRENT}, or <em>late-binding</em>. (See {@link #spliterator()}
* for details.)
*
* @implSpec
* The default implementation creates a sequential {@code Stream} from the
* collection's {@code Spliterator}.
*
* @return a sequential {@code Stream} over the elements in this collection
* @since 1.8
*/
default Stream<T> stream() {
return StreamSupport.stream(spliterator(), false);
}
/**
* Returns a possibly parallel {@code Stream} with this collection as its
* source. It is allowable for this method to return a sequential stream.
*
* <p>This method should be overridden when the {@link #spliterator()}
* method cannot return a spliterator that is {@code IMMUTABLE},
* {@code CONCURRENT}, or <em>late-binding</em>. (See {@link #spliterator()}
* for details.)
*
* @implSpec
* The default implementation creates a parallel {@code Stream} from the
* collection's {@code Spliterator}.
*
* @return a possibly parallel {@code Stream} over the elements in this
* collection
* @since 1.8
*/
default Stream<T> parallelStream() {
return StreamSupport.stream(spliterator(), true);
}
}

40
src/main/java/com/minelittlepony/util/PosHelper.java
View file

@ -5,7 +5,7 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Stream;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Lists;
import com.google.common.collect.Streams;
import com.minelittlepony.util.shape.IShape;
@ -31,29 +31,39 @@ public class PosHelper {
return false;
}
public static Iterable<MutableBlockPos> getAllInRegionMutable(BlockPos origin, IShape shape) {
public static Iterators<MutableBlockPos> adjacentNeighbours(BlockPos origin) {
MutableBlockPos pos = new MutableBlockPos(origin);
Iterator<EnumFacing> directions = Lists.newArrayList(EnumFacing.values()).iterator();
return Iterators.iterate(() -> {
if (directions.hasNext()) {
EnumFacing next = directions.next();
pos.setPos(origin.getX() + next.getXOffset(), origin.getY() + next.getYOffset(), origin.getZ() + next.getZOffset());
return pos;
}
return null;
});
}
public static Iterators<MutableBlockPos> getAllInRegionMutable(BlockPos origin, IShape shape) {
Iterator<MutableBlockPos> iter = BlockPos.getAllInBoxMutable(
origin.add(new BlockPos(shape.getLowerBound())),
origin.add(new BlockPos(shape.getUpperBound()))
).iterator();
return () -> new AbstractIterator<MutableBlockPos>() {
@Override
protected MutableBlockPos computeNext() {
while (iter.hasNext()) {
MutableBlockPos pos = iter.next();
return Iterators.iterate(() -> {
while (iter.hasNext()) {
MutableBlockPos pos = iter.next();
if (shape.isPointInside(new Vec3d(pos.subtract(origin)))) {
return pos;
}
if (shape.isPointInside(new Vec3d(pos.subtract(origin)))) {
return pos;
}
endOfData();
return null;
}
};
return null;
});
}
/**

36
src/main/resources/assets/unicopia/lang/en_US.lang
View file

@ -21,23 +21,27 @@ item.dew_drop.name=Dew Drop
item.cloud_anvil.name=Anvilhead Anvil
item.gem.name=Gem
item.gem.enchanted.name=Gem of %s
item.corrupted_gem.name=Fractured Gem
item.gem.shield.name=Gem of Repulsion
item.corrupted_gem.shield.name=Corrupt Gem of Repulsion
item.gem.charge.name=Channeling Gem
item.corrupted_gem.charge.name=Gem of Draining
item.gem.fire.name=Gem of Flame
item.corrupted_gem.fire.name=Corrupt Gem of Burning
item.gem.inferno.name=Gem of Inferno
item.corrupted_gem.inferno.name=Corrupt Gem of Inferno
item.gem.ice.name=Gem of Freezing
item.corrupted_gem.ice.name=Corrupt Gem of Freezing
item.gem.portal.name=Gem of Transportation
item.corrupted_gem.portal.name=Corrupt Gem of Transportation
item.gem.attract.name=Gem of Retention
item.corrupted_gem.attract.name=Gem of Entrapment
item.gem.minion.name=Gem of Obedience
item.corrupted_gem.minion.name=Corrupt Gem of Obedience
item.corrupted_gem.enchanted.name=Fractured Gem of %s
spell.shield.name=Defense
spell.charge.name=Chanelling
spell.fire.name=Flame
spell.infero.name=Burning
spell.ice.name=Frost
spell.portal.name=Transportation
spell.attract.name=Retention
spell.minion.name=Obedience
curse.shield.name=Repulsion
curse.charge.name=Draining
curse.fire.name=Hades
curse.inferno.name=Inferno
curse.ice.name=Freezing
curse.portal.name=Summoning
curse.attract.name=Entrapment
curse.minion.name=Slavery
item.spellbook.name=Spellbook
item.bag_of_holding.name=Bag of Holding