Tweak mode settings.

This commit is contained in:
James McKay committed 2015-11-25 16:23:01 +11:00
1 parent 4f427ca1ed
commit 672742b184
2 files changed
+36 -5

No files matched your search

@@ -51,11 +51,9 @@ public class WandWorker {
int directionMaskInt = directionLock.mask;
int faceMaskInt = faceLock.mask;
if(
((directionMaskInt & EnumLock.NORTH_SOUTH_MASK) > 0 && (placeDirection == ForgeDirection.NORTH || placeDirection == ForgeDirection.SOUTH))
|| ((directionMaskInt & EnumLock.EAST_WEST_MASK) > 0 && (placeDirection == ForgeDirection.EAST || placeDirection == ForgeDirection.WEST))
|| ((directionMaskInt & EnumLock.UP_DOWN_MASK) > 0 && (placeDirection == ForgeDirection.UP || placeDirection == ForgeDirection.DOWN))
) {
if (((directionLock != EnumLock.HORIZONTAL && directionLock != EnumLock.VERTICAL) || (placeDirection != ForgeDirection.UP && placeDirection != ForgeDirection.DOWN))
&& (directionLock != EnumLock.NORTHSOUTH || (placeDirection != ForgeDirection.NORTH && placeDirection != ForgeDirection.SOUTH))
&& (directionLock != EnumLock.EASTWEST || (placeDirection != ForgeDirection.EAST && placeDirection != ForgeDirection.WEST))) {
candidates.add(startingPoint);
}
while(candidates.size() > 0 && toPlace.size() < maxBlocks) {
@@ -5,10 +5,13 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import portablejim.bbw.BetterBuildersWandsMod;
import portablejim.bbw.basics.EnumLock;
import portablejim.bbw.basics.Point3d;
import portablejim.bbw.core.WandUtility;
import portablejim.bbw.core.WandWorker;
import portablejim.bbw.core.wands.UnbreakingWand;
import portablejim.bbw.shims.BasicPlayerShim;
@@ -18,6 +21,7 @@ import portablejim.bbw.shims.IPlayerShim;
import portablejim.bbw.shims.IWorldShim;
import java.util.LinkedList;
import java.util.List;
/**
* Class to cover common functions between wands.
@@ -50,4 +54,33 @@ public abstract class ItemBasicWand extends Item implements IWandItem{
return true;
}
@SuppressWarnings("unchecked")
public void addInformation(ItemStack itemstack, EntityPlayer player, List lines, boolean extraInfo) {
EnumLock mode = WandUtility.getMode(itemstack);
switch (mode) {
case NORTHSOUTH:
lines.add(StatCollector.translateToLocal(BetterBuildersWandsMod.MODID + ".hover.mode.northsouth"));
break;
case VERTICAL:
lines.add(StatCollector.translateToLocal(BetterBuildersWandsMod.MODID + ".hover.mode.vertical"));
break;
case VERTICALEASTWEST:
lines.add(StatCollector.translateToLocal(BetterBuildersWandsMod.MODID + ".hover.mode.vertialeastwest"));
break;
case EASTWEST:
lines.add(StatCollector.translateToLocal(BetterBuildersWandsMod.MODID + ".hover.mode.eastwest"));
break;
case HORIZONTAL:
lines.add(StatCollector.translateToLocal(BetterBuildersWandsMod.MODID + ".hover.mode.horizontal"));
break;
case VERTICALNORTHSOUTH:
lines.add(StatCollector.translateToLocal(BetterBuildersWandsMod.MODID + ".hover.mode.vertialnorthsouth"));
break;
case NOLOCK:
lines.add(StatCollector.translateToLocal(BetterBuildersWandsMod.MODID + ".hover.mode.nolock"));
break;
}
}
}