Merge branch 'RemoveMJ' of https://github.com/CrazyPants/EnderIO into RemoveMJ

This commit is contained in:
CrazyPants committed 2014-09-23 05:10:23 +08:00
commit d5e26f43ff
11 files changed
+71 -11

No files matched your search

@@ -394,7 +394,7 @@ public class EnderIO {
EntityRegistry.registerGlobalEntityID(RangeEntity.class, "rangeEntity", entityID);
EntityRegistry.registerModEntity(RangeEntity.class, "rangeEntity", entityID, this, 0, 0, false);
FMLInterModComms.sendMessage("Waila", "register", "crazypants.enderio.compat.waila.WailaCompat.load");
FMLInterModComms.sendMessage("Waila", "register", "crazypants.enderio.waila.WailaCompat.load");
}
private void registerFluids() {
@@ -11,9 +11,9 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import crazypants.enderio.BlockEio;
import crazypants.enderio.ModObject;
import crazypants.enderio.compat.waila.IWailaInfoProvider;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.waila.IWailaInfoProvider;
public class BlockReinforcedObsidian extends BlockEio implements IResourceTooltipProvider, IWailaInfoProvider {
@@ -152,6 +152,8 @@ public final class Config {
public static int darkSteelJumpTwoCost = 15;
public static int darkSteelJumpThreeCost = 20;
public static boolean slotZeroPlacesEight = true;
public static int darkSteelWalkPowerCost = darkSteelPowerStorageLevelTwo / 3000;
public static int darkSteelSprintPowerCost = darkSteelWalkPowerCost * 4;
public static boolean darkSteelDrainPowerFromInventory = false;
@@ -574,6 +576,8 @@ public final class Config {
darkSteelSpeedThreeCost = config.get(sectionDarkSteel.name, "darkSteelSpeedThreeCost", darkSteelSpeedThreeCost,
"Number of levels required for the 'Speed 3' upgrade.").getInt(darkSteelSpeedThreeCost);
slotZeroPlacesEight = config.get(sectionDarkSteel.name, "shouldSlotZeroWrap", slotZeroPlacesEight, "Should the dark steel placement, when in the first (0th) slot, place the item in the last slot. If false, will place what's in the second slot.").getBoolean();
darkSteelSpeedOneWalkModifier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedOneWalkModifier", darkSteelSpeedOneWalkModifier,
"Speed modifier applied when walking in the Dark Steel Boots with Speed I.").getDouble(darkSteelSpeedOneWalkModifier);
darkSteelSpeedTwoWalkMultiplier = (float) config.get(sectionDarkSteel.name, "darkSteelSpeedTwoWalkMultiplier", darkSteelSpeedTwoWalkMultiplier,
@@ -125,14 +125,19 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine
}
static boolean doRightClickItemPlace(EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) {
int slot = player.inventory.currentItem + 1;
int current = player.inventory.currentItem;
int slot = current == 0 && Config.slotZeroPlacesEight ? 8 : current + 1;
if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) {
if(!canPlaceBlockOnRightClick(player, world, x, y, z, side, slot)) {
return false;
}
return player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, world, x, y, z, side, par8,
boolean ret = player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, world, x, y, z, side, par8,
par9, par10);
if(player.inventory.mainInventory[slot].stackSize <= 0) {
player.inventory.mainInventory[slot] = null;
}
return ret;
}
return false;
}
@@ -29,11 +29,11 @@ import crazypants.enderio.ClientProxy;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.compat.waila.IWailaInfoProvider;
import crazypants.enderio.conduit.ConduitUtil;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.waila.IWailaInfoProvider;
public abstract class AbstractMachineBlock<T extends AbstractMachineEntity> extends BlockContainer implements IGuiHandler, IResourceTooltipProvider, IWailaInfoProvider {
@@ -1,5 +1,8 @@
package crazypants.enderio.machine;
import org.apache.commons.lang3.ArrayUtils;
import net.minecraft.util.EnumChatFormatting;
import crazypants.enderio.conduit.ConnectionMode;
import crazypants.util.Lang;
@@ -49,6 +52,23 @@ public enum IoMode {
public String getLocalisedName() {
return Lang.localize(unlocalisedName);
}
public String colorLocalisedName() {
String loc = getLocalisedName();
switch (this) {
case DISABLED:
return EnumChatFormatting.RED + loc;
case NONE:
return EnumChatFormatting.GRAY + loc;
case PULL:
return EnumChatFormatting.AQUA + loc;
case PUSH:
return EnumChatFormatting.GOLD + loc;
case PUSH_PULL:
return String.format(Lang.localize(this.getUnlocalisedName() + ".colored"), EnumChatFormatting.GOLD, EnumChatFormatting.WHITE, EnumChatFormatting.AQUA);
default: return loc;
}
}
public IoMode next() {
int index = ordinal() + 1;
@@ -29,7 +29,6 @@ import crazypants.enderio.BlockEio;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.compat.waila.IWailaInfoProvider;
import crazypants.enderio.conduit.ConduitUtil;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IAdvancedTooltipProvider;
@@ -37,6 +36,7 @@ import crazypants.enderio.gui.TooltipAddera;
import crazypants.enderio.machine.IoMode;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.power.PowerHandlerUtil;
import crazypants.enderio.waila.IWailaInfoProvider;
import crazypants.util.BlockCoord;
import crazypants.util.Util;
import crazypants.vecmath.Vector3d;
@@ -19,12 +19,12 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.compat.waila.IWailaInfoProvider;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IAdvancedTooltipProvider;
import crazypants.enderio.gui.TooltipAddera;
import crazypants.enderio.machine.AbstractMachineBlock;
import crazypants.enderio.machine.MachineRecipeRegistry;
import crazypants.enderio.waila.IWailaInfoProvider;
import crazypants.util.Lang;
import crazypants.util.Util;
@@ -1,4 +1,4 @@
package crazypants.enderio.compat.waila;
package crazypants.enderio.waila;
import java.util.List;
@@ -1,9 +1,11 @@
package crazypants.enderio.compat.waila;
package crazypants.enderio.waila;
import static crazypants.enderio.compat.waila.IWailaInfoProvider.*;
import static crazypants.enderio.waila.IWailaInfoProvider.*;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
@@ -12,11 +14,18 @@ import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.gui.IAdvancedTooltipProvider;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.gui.TooltipAddera;
import crazypants.enderio.machine.AbstractMachineBlock;
import crazypants.enderio.machine.AbstractMachineEntity;
import crazypants.enderio.machine.IoMode;
import crazypants.util.Lang;
public class WailaCompat implements IWailaDataProvider {
@@ -45,10 +54,22 @@ public class WailaCompat implements IWailaDataProvider {
Item item = Item.getItemFromBlock(block);
EntityPlayer player = accessor.getPlayer();
World world = player.worldObj;
MovingObjectPosition pos = accessor.getPosition();
int x = pos.blockX, y = pos.blockY, z = pos.blockZ;
if(block instanceof AbstractMachineBlock<?>) {
TileEntity te = world.getTileEntity(x, y, z);
if (te != null && te instanceof AbstractMachineEntity) {
AbstractMachineEntity machine = (AbstractMachineEntity) te;
ForgeDirection side = accessor.getSide();
IoMode mode = machine.getIoMode(side);
currenttip.add(EnumChatFormatting.YELLOW + String.format(Lang.localize("gui.machine.side"), EnumChatFormatting.WHITE + Lang.localize("gui.machine.side." + side.name().toLowerCase())));
currenttip.add(EnumChatFormatting.YELLOW + String.format(Lang.localize("gui.machine.ioMode"), mode.colorLocalisedName()));
}
}
if(block instanceof IWailaInfoProvider) {
IWailaInfoProvider info = (IWailaInfoProvider) block;
MovingObjectPosition pos = accessor.getPosition();
if(block instanceof IAdvancedTooltipProvider) {
int mask = info.getDefaultDisplayMask(world, pos.blockX, pos.blockY, pos.blockZ);