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

Fix to Lava Crystal

Browse source
This commit is contained in:
WayofTime 2021-01-05 17:33:53 -05:00
parent d719b85958
commit 48ef87303a
5 changed files with 61 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.txt
View file

@ -8,6 +8,7 @@ Version 3.0.4
- Fixed NPE in Blood Altar when trying to interact with the contained Fluids
- Also fixed bug that prevented the Altar from accepting fluids piped in as inputs.
- Fixed a client-side crash when right clicking the ground with a Lava Crystal when on a server - now properly makes a fire without consuming the client.
- Added new alchemy arrays:
- Two arrays, which changes the current daylight cycle to day and night.

6
src/main/java/wayoftime/bloodmagic/common/item/ItemLavaCrystal.java
View file

@ -108,6 +108,12 @@ public class ItemLavaCrystal extends ItemBindableBase
if (!player.canPlayerEdit(pos, facing, itemstack))
return ActionResultType.FAIL;
if (context.getWorld().isAirBlock(pos) && context.getWorld().isRemote)
{
context.getWorld().playSound(player, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 1.0F, random.nextFloat() * 0.4F + 0.8F);
return ActionResultType.SUCCESS;
}
if (context.getWorld().isAirBlock(pos) && NetworkHelper.getSoulNetwork(binding).syphonAndDamage(player, SoulTicket.item(player.getHeldItem(hand), 100)).isSuccess())
{
context.getWorld().playSound(player, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 1.0F, random.nextFloat() * 0.4F + 0.8F);

29
src/main/java/wayoftime/bloodmagic/tile/TileDeforesterCharge.java
View file

@ -47,7 +47,9 @@ public class TileDeforesterCharge extends TileTicking
public int explosionRadius;
public int explosionDepth;
public int maxLogs = 64;
public int currentLogs = 0;
public int maxLogs = 128;
public TileDeforesterCharge(TileEntityType<?> type, int explosionRadius, int explosionDepth)
{
@ -83,6 +85,7 @@ public class TileDeforesterCharge extends TileTicking
treePartsMap.put(pos.offset(explosiveDirection), false);
treePartsCache = new LinkedList<BlockPos>();
treePartsCache.add(pos.offset(explosiveDirection));
internalCounter = 0;
// treePartsMap.add(pos.offset(explosiveDirection));
}
@ -103,7 +106,22 @@ public class TileDeforesterCharge extends TileTicking
BlockState checkState = world.getBlockState(checkPos);
if (BlockTags.LOGS.contains(checkState.getBlock()) || BlockTags.LEAVES.contains(checkState.getBlock()))
boolean isTree = false;
if (currentLogs >= maxLogs)
{
continue;
}
if (BlockTags.LOGS.contains(checkState.getBlock()))
{
currentLogs++;
isTree = true;
} else if (BlockTags.LEAVES.contains(checkState.getBlock()))
{
isTree = true;
}
if (isTree)
{
treePartsMap.put(checkPos, false);
newPositions.add(checkPos);
@ -112,12 +130,17 @@ public class TileDeforesterCharge extends TileTicking
}
treePartsMap.put(currentPos, true);
if (currentLogs >= maxLogs)
{
finishedAnalysis = true;
break;
}
}
}
treePartsCache.addAll(newPositions);
System.out.println("Found blocks: " + treePartsMap.size());
// System.out.println("Found blocks: " + treePartsMap.size());
if (foundNew)
{

34
src/main/java/wayoftime/bloodmagic/tile/TileDemonCrystal.java
View file

@ -1,5 +1,7 @@
package wayoftime.bloodmagic.tile;
import java.util.Locale;
import net.minecraft.block.BlockState;
import net.minecraft.inventory.InventoryHelper;
import net.minecraft.item.ItemStack;
@ -7,11 +9,12 @@ import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraftforge.registries.ObjectHolder;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
import wayoftime.bloodmagic.common.block.BlockDemonCrystal;
import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler;
import wayoftime.bloodmagic.tile.base.TileTicking;
import wayoftime.bloodmagic.util.Constants;
import wayoftime.bloodmagic.will.DemonWillHolder;
import wayoftime.bloodmagic.api.compat.EnumDemonWillType;
public class TileDemonCrystal extends TileTicking
{
@ -70,16 +73,14 @@ public class TileDemonCrystal extends TileTicking
if (value >= 0.5)
{
double nextProgress = getCrystalGrowthPerSecond(value);
progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress
* sameWillConversionRate, true) / sameWillConversionRate;
progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate;
} else
{
value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, EnumDemonWillType.DEFAULT);
if (value > 0.5)
{
double nextProgress = getCrystalGrowthPerSecond(value) * timeDelayForWrongWill;
progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), EnumDemonWillType.DEFAULT, nextProgress
* defaultWillConversionRate, true) / defaultWillConversionRate;
progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), EnumDemonWillType.DEFAULT, nextProgress * defaultWillConversionRate, true) / defaultWillConversionRate;
}
}
} else
@ -88,8 +89,7 @@ public class TileDemonCrystal extends TileTicking
{
double nextProgress = getCrystalGrowthPerSecond(value);
progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress
* sameWillConversionRate, true) / sameWillConversionRate;
progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate;
}
}
@ -190,6 +190,13 @@ public class TileDemonCrystal extends TileTicking
holder.readFromNBT(tag, "Will");
placement = Direction.byIndex(tag.getInt("placement"));
progressToNextCrystal = tag.getDouble("progress");
if (!tag.contains(Constants.NBT.WILL_TYPE))
{
this.willType = EnumDemonWillType.DEFAULT;
}
this.willType = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH));
}
@Override
@ -198,6 +205,19 @@ public class TileDemonCrystal extends TileTicking
holder.writeToNBT(tag, "Will");
tag.putInt("placement", placement.getIndex());
tag.putDouble("progress", progressToNextCrystal);
if (willType == EnumDemonWillType.DEFAULT)
{
if (tag.contains(Constants.NBT.WILL_TYPE))
{
tag.remove(Constants.NBT.WILL_TYPE);
}
} else
{
tag.putString(Constants.NBT.WILL_TYPE, willType.toString());
}
return tag;
}

2
src/main/java/wayoftime/bloodmagic/tile/TileShapedExplosive.java
View file

@ -43,7 +43,7 @@ public class TileShapedExplosive extends TileTicking
public TileShapedExplosive()
{
this(TYPE, 1, 3);
this(TYPE, 2, 5);
}
@Override