lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improved the Ellipsoid effect.

Browse source
This commit is contained in:
WayofTime 2018-03-04 09:29:19 -05:00
parent 81ad9bf764
commit e2f7772e82
2 changed files with 84 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
src/main/java/WayofTime/bloodmagic/ritual/RitualEllipsoid.java
View file

@ -1,29 +1,30 @@
package WayofTime.bloodmagic.ritual; package WayofTime.bloodmagic.ritual;
import WayofTime.bloodmagic.BloodMagic; import java.util.ArrayList;
import WayofTime.bloodmagic.ritual.data.*;
import WayofTime.bloodmagic.util.Utils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper; import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.ritual.data.AreaDescriptor;
import javax.annotation.Nullable; import WayofTime.bloodmagic.ritual.data.EnumRuneType;
import WayofTime.bloodmagic.ritual.data.IMasterRitualStone;
import java.util.ArrayList; import WayofTime.bloodmagic.ritual.data.Ritual;
import java.util.Iterator; import WayofTime.bloodmagic.ritual.data.RitualComponent;
import WayofTime.bloodmagic.util.Utils;
public class RitualEllipsoid extends Ritual public class RitualEllipsoid extends Ritual
{ {
// public static final String FELLING_RANGE = "fellingRange"; public static final String SPHEROID_RANGE = "spheroidRange";
public static final String CHEST_RANGE = "chest"; public static final String CHEST_RANGE = "chest";
private boolean cached = false; private boolean cached = false;
@ -32,10 +33,10 @@ public class RitualEllipsoid extends Ritual
public RitualEllipsoid() public RitualEllipsoid()
{ {
super("ritualEllipsoid", 0, 20000, "ritual." + BloodMagic.MODID + ".ellipseRitual"); super("ritualEllipsoid", 0, 20000, "ritual." + BloodMagic.MODID + ".ellipseRitual");
// addBlockRange(FELLING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -3, -10), new BlockPos(11, 27, 11))); addBlockRange(SPHEROID_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), new BlockPos(11, 11, 11)));
addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1));
// setMaximumVolumeAndDistanceOfRange(FELLING_RANGE, 14000, 15, 30); setMaximumVolumeAndDistanceOfRange(SPHEROID_RANGE, 0, 32, 32);
setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3);
} }
@ -55,75 +56,107 @@ public class RitualEllipsoid extends Ritual
return; return;
} }
AreaDescriptor sphereRange = getBlockRange(SPHEROID_RANGE);
AxisAlignedBB sphereBB = sphereRange.getAABB(masterPos);
int minX = (int) (masterPos.getX() - sphereBB.minX);
int maxX = (int) (sphereBB.maxX - masterPos.getX()) - 1;
int minY = (int) (masterPos.getY() - sphereBB.minY);
int maxY = (int) (sphereBB.maxY - masterPos.getY()) - 1;
int minZ = (int) (masterPos.getZ() - sphereBB.minZ);
int maxZ = (int) (sphereBB.maxZ - masterPos.getZ()) - 1;
if (tileInventory != null) if (tileInventory != null)
{ {
IItemHandler inventory = Utils.getInventory(tileInventory, EnumFacing.DOWN); if (tileInventory.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN))
int numSlots = inventory.getSlots();
if (numSlots >= 3)
{ {
ItemStack xStack = inventory.getStackInSlot(0); IItemHandler itemHandler = tileInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN);
ItemStack yStack = inventory.getStackInSlot(1);
ItemStack zStack = inventory.getStackInSlot(2);
if (xStack.isEmpty() || yStack.isEmpty() || zStack.isEmpty()) if (itemHandler.getSlots() <= 0)
{ {
return; return;
} }
int xR = xStack.getCount(); int blockSlot = -1;
int yR = yStack.getCount(); for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++)
int zR = zStack.getCount(); {
ItemStack stack = itemHandler.extractItem(invSlot, 1, true);
if (stack.isEmpty() || !(stack.getItem() instanceof ItemBlock))
continue;
int j = -yR; blockSlot = invSlot;
int i = -xR; break;
int k = -zR; }
if (blockSlot == -1)
{
return;
}
int xR = Math.max(maxX, minX);
int yR = Math.max(maxY, minY);
int zR = Math.max(maxZ, minZ);
int j = -minX;
int i = -minY;
int k = -minZ;
if (currentPos != null) if (currentPos != null)
{ {
j = currentPos.getY(); j = currentPos.getY();
i = Math.min(xR, Math.max(-xR, currentPos.getX())); i = Math.min(xR, Math.max(-minX, currentPos.getX()));
k = Math.min(zR, Math.max(-zR, currentPos.getZ())); k = Math.min(zR, Math.max(-minZ, currentPos.getZ()));
} }
int checks = 0;
int maxChecks = 100;
while (j <= yR) while (j <= maxY)
{ {
while (i <= xR) while (i <= maxX)
{ {
while (k <= zR) while (k <= maxZ)
{ {
checks++;
if (checks >= maxChecks)
{
this.currentPos = new BlockPos(i, j, k);
return;
}
if (checkIfEllipsoidShell(xR, yR, zR, i, j, k)) if (checkIfEllipsoidShell(xR, yR, zR, i, j, k))
{ {
BlockPos newPos = masterPos.add(i, j, k); BlockPos newPos = masterPos.add(i, j, k);
//
if (world.isAirBlock(newPos)) if (!world.getBlockState(newPos).getBlock().isReplaceable(world, newPos))
{ {
if (j > 0)
{
world.setBlockState(newPos, Blocks.GLASS.getDefaultState());
} else
{
world.setBlockState(newPos, Blocks.STONE.getDefaultState());
}
k++; k++;
this.currentPos = new BlockPos(i, j, k); continue;
return;
} }
IBlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(blockSlot).getItem()).getStateFromMeta(itemHandler.getStackInSlot(blockSlot).getItemDamage());
world.setBlockState(newPos, placeState);
itemHandler.extractItem(blockSlot, 1, false);
tileInventory.markDirty();
//TODO:
masterRitualStone.getOwnerNetwork().syphon(getRefreshCost());
k++;
this.currentPos = new BlockPos(i, j, k);
return;
} }
k++; k++;
} }
i++; i++;
k = -zR; k = -minZ;
} }
j++; j++;
i = -xR; i = -minX;
this.currentPos = new BlockPos(i, j, k); this.currentPos = new BlockPos(i, j, k);
return; return;
} }
j = -yR; j = -minY;
this.currentPos = new BlockPos(i, j, k); this.currentPos = new BlockPos(i, j, k);
return; return;
} }
} }
} }

5
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -605,7 +605,7 @@ ritual.bloodmagic.animalGrowthRitual=Ritual of the Shepherd
ritual.bloodmagic.forsakenSoulRitual=Gathering of the Forsaken Souls ritual.bloodmagic.forsakenSoulRitual=Gathering of the Forsaken Souls
ritual.bloodmagic.crystalHarvestRitual=Crack of the Fractured Crystal ritual.bloodmagic.crystalHarvestRitual=Crack of the Fractured Crystal
ritual.bloodmagic.meteorRitual=Mark of the Falling Tower ritual.bloodmagic.meteorRitual=Mark of the Falling Tower
ritual.bloodmagic.ellipseRitual=Focus of the Ellipsoid
ritual.bloodmagic.cobblestoneRitual=Le Vulcanos Frigius ritual.bloodmagic.cobblestoneRitual=Le Vulcanos Frigius
ritual.bloodmagic.placerRitual=Laying of the Filler ritual.bloodmagic.placerRitual=Laying of the Filler
ritual.bloodmagic.fellingRitual=Crash of the Timberman ritual.bloodmagic.fellingRitual=Crash of the Timberman
@ -713,6 +713,9 @@ ritual.bloodmagic.forsakenSoulRitual.crystal.info=(Crystal) Demon Crystals in th
ritual.bloodmagic.forsakenSoulRitual.damage.info=(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals. ritual.bloodmagic.forsakenSoulRitual.damage.info=(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals.
ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it. ritual.bloodmagic.crystalHarvestRitual.crystal.info=(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it.
ritual.bloodmagic.ellipseRitual.spheroidRange.info=(Placement) The range that the ritual will place its blocks in. Spheroid is centered on the ritual - if one side is shorter than the side opposite the spheroid is truncated.
ritual.bloodmagic.ellipseRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world.
ritual.bloodmagic.placerRitual.placerRange.info=(Placement) The range that the ritual will place its blocks in. ritual.bloodmagic.placerRitual.placerRange.info=(Placement) The range that the ritual will place its blocks in.
ritual.bloodmagic.placerRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. ritual.bloodmagic.placerRitual.chest.info=(Chest) The location of the inventory that the ritual will grab blocks from to place in the world.
ritual.bloodmagic.fellingRitual.fellingRange.info=(Cutting) The range that the ritual will search out logs and leaves in order to cut down. ritual.bloodmagic.fellingRitual.fellingRange.info=(Cutting) The range that the ritual will search out logs and leaves in order to cut down.