diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 20b61b5c..79c26c2e 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -5,8 +5,8 @@ import java.io.File; import java.io.FileWriter; import java.lang.reflect.Field; import java.util.List; +import java.util.Locale; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -166,6 +166,7 @@ import static crazypants.enderio.EnderIO.*; public class EnderIO { public static final String MODID = "EnderIO"; + public static final String DOMAIN = MODID.toLowerCase(Locale.US); public static final String MOD_NAME = "Ender IO"; public static final String VERSION = "@VERSION@"; diff --git a/src/main/java/crazypants/enderio/EnderIOTab.java b/src/main/java/crazypants/enderio/EnderIOTab.java index f659c2a8..7fc2ec87 100644 --- a/src/main/java/crazypants/enderio/EnderIOTab.java +++ b/src/main/java/crazypants/enderio/EnderIOTab.java @@ -27,10 +27,10 @@ public class EnderIOTab extends CreativeTabs { return MODID; } - @Override - @SideOnly(Side.CLIENT) - public Item getTabIconItem() { - return EnderIO.itemEnderface; - } + @Override + @SideOnly(Side.CLIENT) + public Item getTabIconItem() { + return EnderIO.itemEnderface; + } } diff --git a/src/main/java/crazypants/enderio/api/teleport/TravelSource.java b/src/main/java/crazypants/enderio/api/teleport/TravelSource.java index 3d820a02..8929a659 100644 --- a/src/main/java/crazypants/enderio/api/teleport/TravelSource.java +++ b/src/main/java/crazypants/enderio/api/teleport/TravelSource.java @@ -8,7 +8,7 @@ public enum TravelSource { BLOCK(0, Config.travelAnchorMaxDistance), STAFF(Config.travelStaffPowerPerBlockRF, Config.travelStaffMaxDistance), STAFF_BLINK(Config.travelStaffPowerPerBlockRF, Config.travelStaffMaxBlinkDistance), - TELEPAD(0, 0, EnderIO.MODID + ":telepad.teleport"); + TELEPAD(0, 0, EnderIO.DOMAIN + ":telepad.teleport"); public static int getMaxDistance() { return STAFF.maxDistanceTravelledSq; diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java index 6b22076e..ed6c5d1c 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelAnvil.java @@ -88,12 +88,12 @@ public class BlockDarkSteelAnvil extends BlockAnvil implements IResourceTooltipP @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { - this.blockIcon = register.registerIcon(EnderIO.MODID + ":anvil_base"); + this.blockIcon = register.registerIcon(EnderIO.DOMAIN + ":anvil_base"); this.anvilIcons = new IIcon[anvilIconNames.length]; for (int i = 0; i < this.anvilIcons.length; ++i) { - this.anvilIcons[i] = register.registerIcon(EnderIO.MODID + ":" + anvilIconNames[i]); + this.anvilIcons[i] = register.registerIcon(EnderIO.DOMAIN + ":" + anvilIconNames[i]); } } diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java index e302e199..09c25b35 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java @@ -27,7 +27,7 @@ public class BlockDarkSteelLadder extends BlockLadder implements IResourceToolti super(); setBlockName(ModObject.blockDarkSteelLadder.unlocalisedName); - setBlockTextureName(EnderIO.MODID + ":" + ModObject.blockDarkSteelLadder.unlocalisedName); + setBlockTextureName(EnderIO.DOMAIN + ":" + ModObject.blockDarkSteelLadder.unlocalisedName); setStepSound(Block.soundTypeMetal); setCreativeTab(EnderIOTab.tabEnderIO); setHardness(0.4F); diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index 6881b98e..5ee27636 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -7,10 +7,8 @@ import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -30,7 +28,6 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.config.Config; import crazypants.enderio.machine.MachineRecipeInput; -import crazypants.enderio.machine.IMachineRecipe.ResultStack; import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.IPaintedBlock; import crazypants.enderio.machine.painter.PaintSourceValidator; diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index 5742d735..00c7dc51 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -61,11 +61,11 @@ public class MEConduit extends AbstractConduit implements IMEConduit { coreTextures = new IIcon[2]; longTextures = new IIcon[2]; - coreTextures[0] = register.registerIcon(EnderIO.MODID + ":meConduitCore"); - coreTextures[1] = register.registerIcon(EnderIO.MODID + ":meConduitCoreDense"); + coreTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCore"); + coreTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitCoreDense"); - longTextures[0] = register.registerIcon(EnderIO.MODID + ":meConduit"); - longTextures[1] = register.registerIcon(EnderIO.MODID + ":meConduitDense"); + longTextures[0] = register.registerIcon(EnderIO.DOMAIN + ":meConduit"); + longTextures[1] = register.registerIcon(EnderIO.DOMAIN + ":meConduitDense"); } @Override diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 6218569d..5e27b565 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -492,7 +492,7 @@ public final class Config { PacketHandler.INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); FMLCommonHandler.instance().bus().register(new Config()); - configDirectory = new File(event.getModConfigurationDirectory(), EnderIO.MODID.toLowerCase()); + configDirectory = new File(event.getModConfigurationDirectory(), EnderIO.DOMAIN); if(!configDirectory.exists()) { configDirectory.mkdir(); } diff --git a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java index 0f633656..35bda744 100644 --- a/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java +++ b/src/main/java/crazypants/enderio/fluid/ItemBucketEio.java @@ -34,7 +34,7 @@ public class ItemBucketEio extends ItemBucket { setContainerItem(Items.bucket); String str = "bucket" + StringUtils.capitalize(fluidName); setUnlocalizedName(str); - setTextureName("enderIO:" + str); + setTextureName("enderio:" + str); } protected void init() { diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index 789e69f5..015ea563 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -226,9 +226,9 @@ public class KeyTracker { if(nightVisionKey.isPressed()) { boolean isActive = !DarkSteelController.instance.isNightVisionActive(); if(isActive) { - player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.MODID + ":ds.nightvision.on", 0.1f, player.worldObj.rand.nextFloat() * 0.4f - 0.2f + 1.0f, false); + player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.DOMAIN + ":ds.nightvision.on", 0.1f, player.worldObj.rand.nextFloat() * 0.4f - 0.2f + 1.0f, false); } else { - player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.MODID + ":ds.nightvision.off", 0.1f, 1.0f, false); + player.worldObj.playSound(player.posX, player.posY, player.posZ, EnderIO.DOMAIN + ":ds.nightvision.off", 0.1f, 1.0f, false); } DarkSteelController.instance.setNightVisionActive(isActive); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java index 2501223a..3896f6f3 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/NightVisionUpgrade.java @@ -34,7 +34,6 @@ public class NightVisionUpgrade extends AbstractUpgrade { return pot; } - public NightVisionUpgrade(NBTTagCompound tag) { super(UPGRADE_NAME, tag); } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 53018a99..a4c26b47 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -61,7 +61,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi private final ResourceLocation soundRes; public static ResourceLocation getSoundFor(String sound) { - return sound == null ? null : new ResourceLocation(EnderIO.MODID + ":" + sound); + return sound == null ? null : new ResourceLocation(EnderIO.DOMAIN + ":" + sound); } public AbstractMachineEntity(SlotDefinition slotDefinition) { diff --git a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java index f1de15d4..a8a0ae53 100644 --- a/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/TechneMachineRenderer.java @@ -22,11 +22,11 @@ public class TechneMachineRenderer extends Tech private OverlayRenderer overlay = new OverlayRenderer(); public TechneMachineRenderer(AbstractMachineBlock block, String modelPath) { - super(EnderIO.MODID, modelPath, block.getRenderType(), new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); + super(EnderIO.DOMAIN, modelPath, block.getRenderType(), new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); } public TechneMachineRenderer(int renderId, String modelPath) { - super(TechneUtil.getModel(EnderIO.MODID, modelPath), renderId, new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); + super(TechneUtil.getModel(EnderIO.DOMAIN, modelPath), renderId, new VertexTransformComposite(new VertexRotationFacing(ForgeDirection.NORTH))); } public TechneMachineRenderer addTransform(VertexTransform vt) { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java index b9f6b228..e4987add 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/BlockZombieGenerator.java @@ -103,7 +103,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock> channels = new EnumMap>(ChannelType.class); + protected Multimap channels = MultimapBuilder.enumKeys(ChannelType.class).arrayListValues().build(); - public List getChannelsForType(ChannelType type) { + public Collection getChannelsForType(ChannelType type) { return channels.get(type); } @@ -16,7 +17,7 @@ public class ChannelRegister { if(channel == null) { return; } - List chans = getChannelsForType(channel.getType()); + Collection chans = getChannelsForType(channel.getType()); if(!chans.contains(channel)) { chans.add(channel); } @@ -31,9 +32,5 @@ public class ChannelRegister { public void reset() { channels.clear(); - for (ChannelType type : ChannelType.values()) { - channels.put(type, new ArrayList()); - } } - } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java index 8e966521..57e668ce 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java @@ -5,7 +5,6 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; -import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -27,6 +26,8 @@ import org.apache.commons.io.FileUtils; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.PlayerUtil; import com.enderio.core.common.util.RoundRobinIterator; +import com.google.common.collect.Multimap; +import com.google.common.collect.MultimapBuilder; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -94,9 +95,9 @@ public class ServerChannelRegister extends ChannelRegister { saveExecutor.execute(new SaveRunnable(copyChannels())); } - private static void doStore(EnumMap> channels) { + private static void doStore(Multimap chans) { File dataFile = getDataFile(); - if(!createFolderAndWriteFile(channels, dataFile)) { + if(!createFolderAndWriteFile(chans, dataFile)) { dataFile = getFallbackDataFile(); Log.error("ServerChannelRegister: Attempting to write Dimensional Transceiver data to fallback location: " + dataFile.getAbsolutePath()); try { @@ -110,11 +111,11 @@ public class ServerChannelRegister extends ChannelRegister { Log.info("ServerChannelRegister: Dimensional Transceiver data saved to " + dataFile.getAbsolutePath()); } - private static boolean createFolderAndWriteFile(EnumMap> data, File dataFile) { + private static boolean createFolderAndWriteFile(Multimap chans, File dataFile) { try { File parentFolder = dataFile.getParentFile(); FileUtils.forceMkdir(parentFolder); - writeFile(data, dataFile); + writeFile(chans, dataFile); return true; } catch (Exception e) { Log.error("ServerChannelRegister: Could not write Dimensional Transceiver channels to " + dataFile.getAbsolutePath() + " : " + e); @@ -122,34 +123,32 @@ public class ServerChannelRegister extends ChannelRegister { } } - protected static void writeFile(EnumMap> chans, File dataFile) throws IOException { + protected static void writeFile(Multimap multimap, File dataFile) throws IOException { if(dataFile.exists()) { File tmpFile = new File(dataFile.getAbsolutePath() + ".tmp"); - doWriteFile(chans, tmpFile); + doWriteFile(multimap, tmpFile); if(FileUtils.deleteQuietly(dataFile)) { tmpFile.renameTo(dataFile); } } else { - doWriteFile(chans, dataFile); + doWriteFile(multimap, dataFile); } } - protected static void doWriteFile(EnumMap> chans, File dataFile) throws IOException { + protected static void doWriteFile(Multimap multimap, File dataFile) throws IOException { JsonWriter writer = new JsonWriter(new FileWriter(dataFile, false)); writer.setIndent(" "); writer.beginArray(); - for (List chanList : chans.values()) { - for (Channel chan : chanList) { - writer.beginObject(); - writer.name("name").value(chan.getName()); - if(chan.getUser() != null) { - writer.name("user").value(chan.getUser().toString()); - } - writer.name("type").value(chan.getType().ordinal()); - writer.endObject(); + for (Channel chan : multimap.values()) { + writer.beginObject(); + writer.name("name").value(chan.getName()); + if (chan.getUser() != null) { + writer.name("user").value(chan.getUser().toString()); } + writer.name("type").value(chan.getType().ordinal()); + writer.endObject(); } writer.endArray(); writer.close(); @@ -163,11 +162,11 @@ public class ServerChannelRegister extends ChannelRegister { return new File(DimensionManager.getCurrentSaveRootDirectory(), "dimensionalTransceiver.json"); } - private static EnumMap> copyChannels() { + private static Multimap copyChannels() { //NB: deep copy not needed as all types are immuatble - EnumMap> copy = new EnumMap>(ChannelType.class); - for (Entry> entry : instance.channels.entrySet()) { - copy.put(entry.getKey(), new ArrayList(entry.getValue())); + Multimap copy = MultimapBuilder.enumKeys(ChannelType.class).arrayListValues().build(); + for (Entry entry : instance.channels.entries()) { + copy.put(entry.getKey(), entry.getValue()); } return copy; } @@ -365,10 +364,10 @@ public class ServerChannelRegister extends ChannelRegister { private static class SaveRunnable implements Runnable { - private EnumMap> chans; + private Multimap chans; - public SaveRunnable(EnumMap> chans) { - this.chans = chans; + public SaveRunnable(Multimap multimap) { + this.chans = multimap; } @Override diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java index 9f5c728c..8c2424e7 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.transceiver.gui; import java.awt.Color; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; @@ -10,6 +11,7 @@ import net.minecraft.client.renderer.Tessellator; import com.enderio.core.client.gui.widget.GuiScrollableList; import com.enderio.core.client.render.ColorUtil; +import com.google.common.collect.Lists; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.transceiver.Channel; @@ -27,11 +29,11 @@ public class GuiChannelList extends GuiScrollableList { this.parent = parent; } - void setChannels(List val) { - if(val == null) { + void setChannels(Collection collection) { + if(collection == null) { channels = Collections.emptyList(); } - channels = val; + channels = Lists.newArrayList(collection); } @Override diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java index f37a8708..d6cb4eb5 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java @@ -24,7 +24,7 @@ public class TelePadRenderer extends TechneModelRenderer { private final Collection strippedModel = Lists.newArrayList(); public TelePadRenderer() { - super(TechneUtil.getModel(EnderIO.MODID, "models/telePad"), BlockTelePad.renderId); + super(TechneUtil.getModel(EnderIO.DOMAIN, "models/telePad"), BlockTelePad.renderId); for (String s : this.model.keySet()) { if(!s.equals("glass") && !s.contains("blade")) { strippedModel.add(this.model.get(s));