tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Readded electrical module

Browse source
This commit is contained in:
Calclavia 2014-01-09 23:08:22 +08:00
parent c5ed109d97
commit b20537b0a4
57 changed files with 194 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/resonantinduction/archaic/Archaic.java
View file

@ -1,12 +1,11 @@
package resonantinduction.archaic;
import java.util.Arrays;
import java.util.logging.Logger;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings;
import resonantinduction.old.Reference;
import calclavia.lib.utility.LanguageUtility;
import calclavia.lib.network.PacketHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
@ -14,6 +13,7 @@ import cpw.mods.fml.common.ModMetadata;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
/**
@ -23,6 +23,7 @@ import cpw.mods.fml.common.network.NetworkRegistry;
*
*/
@Mod(modid = Archaic.ID, name = Archaic.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID)
@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class Archaic
{
/** Mod Information */
@ -38,8 +39,6 @@ public class Archaic
@Mod.Metadata(ID)
public static ModMetadata metadata;
public static final Logger LOGGER = Logger.getLogger(Reference.NAME);
@EventHandler
public void preInit(FMLPreInitializationEvent evt)
{

2
src/main/java/resonantinduction/core/ClientProxy.java
View file

@ -44,7 +44,7 @@ public class ClientProxy extends CommonProxy
}
@Override
public boolean isFancy()
public boolean isGraphicsFancy()
{
return FMLClientHandler.instance().getClient().gameSettings.fancyGraphics;
}

30
src/main/java/resonantinduction/core/CommonProxy.java
View file

@ -3,44 +3,20 @@
*/
package resonantinduction.core;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
import resonantinduction.core.prefab.ProxyBase;
/**
* @author Calclavia
*
*/
public class CommonProxy implements IGuiHandler
public class CommonProxy extends ProxyBase
{
public void preInit()
{
}
public void postInit()
{
}
@Override
public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z)
{
return null;
}
@Override
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
{
return null;
}
public boolean isPaused()
{
return false;
}
public boolean isFancy()
public boolean isGraphicsFancy()
{
return false;
}

4
src/main/java/resonantinduction/core/ResonantInduction.java
View file

@ -7,10 +7,11 @@ import net.minecraftforge.common.MinecraftForge;
import org.modstats.ModstatInfo;
import org.modstats.Modstats;
import resonantinduction.core.link.LinkEventHandler;
import resonantinduction.core.prefab.part.PacketMultiPart;
import resonantinduction.core.resource.ItemDust;
import resonantinduction.core.resource.ResourceGenerator;
import resonantinduction.old.Reference;
import resonantinduction.old.core.multipart.PacketMultiPart;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.network.PacketTile;
import calclavia.lib.utility.LanguageUtility;
@ -71,6 +72,7 @@ public class ResonantInduction
// Register Forge Events
MinecraftForge.EVENT_BUS.register(ResourceGenerator.INSTANCE);
MinecraftForge.EVENT_BUS.register(new LinkEventHandler());
Settings.CONFIGURATION.load();

2
src/main/java/resonantinduction/old/energy/ILinkable.java → src/main/java/resonantinduction/core/link/ILinkable.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy;
package resonantinduction.core.link;
import net.minecraft.entity.player.EntityPlayer;
import universalelectricity.api.vector.VectorWorld;

4
src/main/java/resonantinduction/old/energy/LinkEvent.java → src/main/java/resonantinduction/core/link/LinkEventHandler.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.old.energy;
package resonantinduction.core.link;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -15,7 +15,7 @@ import codechicken.multipart.ControlKeyModifer;
/**
* @author Calclavia
*/
public class LinkEvent
public class LinkEventHandler
{
@ForgeSubscribe
public void linkEvent(MultitoolEvent evt)

33
src/main/java/resonantinduction/core/prefab/ProxyBase.java Normal file
View file

@ -0,0 +1,33 @@
package resonantinduction.core.prefab;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
public abstract class ProxyBase implements IGuiHandler
{
public void preInit()
{
}
public void init()
{
}
public void postInit()
{
}
@Override
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
{
return null;
}
@Override
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
{
return null;
}
}

2
src/main/java/resonantinduction/old/core/multipart/PacketMultiPart.java → src/main/java/resonantinduction/core/prefab/part/PacketMultiPart.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.core.multipart;
package resonantinduction.core.prefab.part;
import java.util.ArrayList;
import java.util.List;

20
src/main/java/resonantinduction/old/energy/ClientProxy.java → src/main/java/resonantinduction/electrical/ClientProxy.java
View file

@ -1,18 +1,18 @@
package resonantinduction.old.energy;
package resonantinduction.electrical;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import resonantinduction.electrical.battery.RenderBattery;
import resonantinduction.electrical.battery.TileBattery;
import resonantinduction.electrical.fx.FXElectricBolt;
import resonantinduction.electrical.multimeter.GuiMultimeter;
import resonantinduction.electrical.multimeter.PartMultimeter;
import resonantinduction.electrical.tesla.RenderTesla;
import resonantinduction.electrical.tesla.TileTesla;
import resonantinduction.old.core.render.BlockRenderingHandler;
import resonantinduction.old.core.render.RenderRIItem;
import resonantinduction.old.energy.battery.RenderBattery;
import resonantinduction.old.energy.battery.TileBattery;
import resonantinduction.old.energy.fx.FXElectricBolt;
import resonantinduction.old.energy.multimeter.GuiMultimeter;
import resonantinduction.old.energy.multimeter.PartMultimeter;
import resonantinduction.old.energy.tesla.RenderTesla;
import resonantinduction.old.energy.tesla.TileTesla;
import resonantinduction.old.transport.levitator.RenderLevitator;
import resonantinduction.old.transport.levitator.TileEMLevitator;
import universalelectricity.api.vector.Vector3;
@ -35,8 +35,8 @@ public class ClientProxy extends CommonProxy
public void preInit()
{
RenderingRegistry.registerBlockHandler(BlockRenderingHandler.INSTANCE);
MinecraftForgeClient.registerItemRenderer(ResonantInductionEnergy.itemMultimeter.itemID, RenderRIItem.INSTANCE);
MinecraftForgeClient.registerItemRenderer(ResonantInductionEnergy.itemTransformer.itemID, RenderRIItem.INSTANCE);
MinecraftForgeClient.registerItemRenderer(Electrical.itemMultimeter.itemID, RenderRIItem.INSTANCE);
MinecraftForgeClient.registerItemRenderer(Electrical.itemTransformer.itemID, RenderRIItem.INSTANCE);
ClientRegistry.bindTileEntitySpecialRenderer(TileTesla.class, new RenderTesla());
ClientRegistry.bindTileEntitySpecialRenderer(TileEMLevitator.class, new RenderLevitator());
ClientRegistry.bindTileEntitySpecialRenderer(TileBattery.class, new RenderBattery());

35
src/main/java/resonantinduction/old/energy/CommonProxy.java → src/main/java/resonantinduction/electrical/CommonProxy.java
View file

@ -1,35 +1,18 @@
/**
*
*/
package resonantinduction.old.energy;
package resonantinduction.electrical;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.old.electrical.multimeter.ContainerMultimeter;
import resonantinduction.old.energy.multimeter.PartMultimeter;
import universalelectricity.api.vector.Vector3;
import codechicken.lib.colour.ColourRGBA;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import cpw.mods.fml.common.network.IGuiHandler;
import resonantinduction.core.prefab.ProxyBase;
import resonantinduction.electrical.multimeter.ContainerMultimeter;
import resonantinduction.electrical.multimeter.PartMultimeter;
import universalelectricity.api.vector.Vector3;
/**
* @author Calclavia
*
*/
public class CommonProxy implements IGuiHandler
public class CommonProxy extends ProxyBase
{
public void preInit()
{
}
public void postInit()
{
}
@Override
public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z)
{
@ -47,12 +30,6 @@ public class CommonProxy implements IGuiHandler
return null;
}
@Override
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
{
return null;
}
public void renderElectricShock(World world, Vector3 start, Vector3 target, float r, float g, float b, boolean split)
{

86
src/main/java/resonantinduction/old/energy/ResonantInductionEnergy.java → src/main/java/resonantinduction/electrical/Electrical.java
View file

@ -1,38 +1,26 @@
package resonantinduction.old.energy;
package resonantinduction.electrical;
import ic2.api.item.Items;
import java.util.Arrays;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import org.modstats.Modstats;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.ResonantInductionTabs;
import resonantinduction.core.Settings;
import resonantinduction.electrical.battery.BlockBattery;
import resonantinduction.electrical.battery.ItemBlockBattery;
import resonantinduction.electrical.battery.TileBattery;
import resonantinduction.electrical.multimeter.ItemMultimeter;
import resonantinduction.electrical.tesla.BlockTesla;
import resonantinduction.electrical.tesla.TileTesla;
import resonantinduction.electrical.transformer.ItemTransformer;
import resonantinduction.electrical.wire.EnumWireMaterial;
import resonantinduction.electrical.wire.ItemWire;
import resonantinduction.old.Reference;
import resonantinduction.old.core.multipart.MultipartRI;
import resonantinduction.old.core.multipart.PacketMultiPart;
import resonantinduction.old.electrical.multimeter.ItemMultimeter;
import resonantinduction.old.energy.battery.BlockBattery;
import resonantinduction.old.energy.battery.ItemBlockBattery;
import resonantinduction.old.energy.battery.TileBattery;
import resonantinduction.old.energy.tesla.BlockTesla;
import resonantinduction.old.energy.tesla.TileTesla;
import resonantinduction.old.energy.transformer.ItemTransformer;
import resonantinduction.old.energy.wire.EnumWireMaterial;
import resonantinduction.old.energy.wire.ItemWire;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.network.PacketTile;
import calclavia.lib.recipe.UniversalRecipe;
import calclavia.lib.utility.LanguageUtility;
import codechicken.lib.colour.ColourRGBA;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
@ -47,24 +35,23 @@ import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
/**
* The core module of Resonant Induction
* Resonant Induction Electrical Module
*
* @author Calclavia
*
*/
//@Mod(modid = ResonantInductionEnergy.ID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:ResonantInduction|Core")
//@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class ResonantInductionEnergy
@Mod(modid = Electrical.ID, name = Electrical.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID)
@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class Electrical
{
/**
* Mod Information
*/
public static final String ID = "ResonantInduction|Energy";
/** Mod Information */
public static final String ID = "ResonantInduction|Electrical";
public static final String NAME = Reference.NAME + " Electrical";
@Instance(ID)
public static ResonantInductionEnergy INSTANCE;
public static Electrical INSTANCE;
//@SidedProxy(clientSide = "resonantinduction.energy.ClientProxy", serverSide = "resonantinduction.energy.CommonProxy")
@SidedProxy(clientSide = "resonantinduction.electrical.ClientProxy", serverSide = "resonantinduction.electrical.CommonProxy")
public static CommonProxy proxy;
@Mod.Metadata(ID)
@ -76,21 +63,14 @@ public class ResonantInductionEnergy
public static Item itemTransformer;
// Blocks
public static Block blockTesla, blockBattery;
/**
* Packets
*/
public static final PacketTile PACKET_TILE = new PacketTile(Reference.CHANNEL);
public static final PacketMultiPart PACKET_MULTIPART = new PacketMultiPart(Reference.CHANNEL);
public static final ColourRGBA[] DYE_COLORS = new ColourRGBA[] { new ColourRGBA(255, 255, 255, 255), new ColourRGBA(1, 0, 0, 1d), new ColourRGBA(0, 0.608, 0.232, 1d), new ColourRGBA(0.588, 0.294, 0, 1d), new ColourRGBA(0, 0, 1, 1d), new ColourRGBA(0.5, 0, 05, 1d), new ColourRGBA(0, 1, 1, 1d), new ColourRGBA(0.8, 0.8, 0.8, 1d), new ColourRGBA(0.3, 0.3, 0.3, 1d), new ColourRGBA(1, 0.412, 0.706, 1d), new ColourRGBA(0.616, 1, 0, 1d), new ColourRGBA(1, 1, 0, 1d), new ColourRGBA(0.46f, 0.932, 1, 1d), new ColourRGBA(0.5, 0.2, 0.5, 1d), new ColourRGBA(0.7, 0.5, 0.1, 1d), new ColourRGBA(1, 1, 1, 1d) };
public static Block blockTesla;
public static Block blockBattery;
@EventHandler
public void preInit(FMLPreInitializationEvent evt)
{
ResonantInduction.LOGGER.setParent(FMLLog.getLogger());
NetworkRegistry.instance().registerGuiHandler(this, ResonantInductionEnergy.proxy);
Modstats.instance().getReporter().registerMod(this);
NetworkRegistry.instance().registerGuiHandler(this, proxy);
Settings.CONFIGURATION.load();
// Items
@ -113,8 +93,6 @@ public class ResonantInductionEnergy
GameRegistry.registerTileEntity(TileTesla.class, blockTesla.getUnlocalizedName());
GameRegistry.registerTileEntity(TileBattery.class, blockBattery.getUnlocalizedName());
ResonantInductionEnergy.proxy.preInit();
/**
* Set reference itemstacks
*/
@ -124,22 +102,15 @@ public class ResonantInductionEnergy
{
material.setWire(itemPartWire);
}
proxy.preInit();
}
@EventHandler
public void init(FMLInitializationEvent evt)
{
metadata.modId = ID;
metadata.name = Reference.NAME;
metadata.description = LanguageUtility.getLocal("meta.resonantinduction.description");
metadata.url = "http://calclavia.com/resonant-induction";
metadata.logoFile = "ri_logo.png";
metadata.version = Reference.VERSION + "." + Reference.BUILD_VERSION;
metadata.authorList = Arrays.asList(new String[] { "Calclavia", "DarkCow" });
metadata.credits = LanguageUtility.getLocal("meta.resonantinduction.credits");
metadata.autogenerated = false;
MultipartRI.INSTANCE = new MultipartRI();
Settings.setModMetadata(metadata, ID, NAME);
MultipartElectrical.INSTANCE = new MultipartElectrical();
proxy.init();
}
@EventHandler
@ -181,6 +152,7 @@ public class ResonantInductionEnergy
{
GameRegistry.addRecipe(new ShapelessOreRecipe(EnumWireMaterial.COPPER.getWire(), "universalCable"));
}
ResonantInductionEnergy.proxy.postInit();
proxy.postInit();
}
}

26
src/main/java/resonantinduction/old/core/multipart/MultipartRI.java → src/main/java/resonantinduction/electrical/MultipartElectrical.java
View file

@ -1,28 +1,28 @@
package resonantinduction.old.core.multipart;
package resonantinduction.electrical;
import resonantinduction.old.energy.multimeter.PartMultimeter;
import resonantinduction.old.energy.transformer.PartTransformer;
import resonantinduction.old.energy.wire.flat.PartFlatSwitchWire;
import resonantinduction.old.energy.wire.flat.PartFlatWire;
import resonantinduction.old.energy.wire.framed.PartFramedSwitchWire;
import resonantinduction.old.energy.wire.framed.PartFramedWire;
import resonantinduction.electrical.multimeter.PartMultimeter;
import resonantinduction.electrical.transformer.PartTransformer;
import resonantinduction.electrical.wire.flat.PartFlatSwitchWire;
import resonantinduction.electrical.wire.flat.PartFlatWire;
import resonantinduction.electrical.wire.framed.PartFramedSwitchWire;
import resonantinduction.electrical.wire.framed.PartFramedWire;
import codechicken.multipart.MultiPartRegistry;
import codechicken.multipart.MultiPartRegistry.IPartFactory;
import codechicken.multipart.MultipartGenerator;
import codechicken.multipart.TMultiPart;
public class MultipartRI implements IPartFactory
public class MultipartElectrical implements IPartFactory
{
public static MultipartRI INSTANCE;
public static MultipartElectrical INSTANCE;
public static final String[] PART_TYPES = { "resonant_induction_wire", "resonant_induction_switch_wire", "resonant_induction_flat_wire", "resonant_induction_flat_switch_wire", "resonant_induction_multimeter", "resonant_induction_transformer" };
public MultipartRI()
public MultipartElectrical()
{
MultiPartRegistry.registerParts(this, PART_TYPES);
MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "resonantinduction.transport.wire.trait.TraitConductor");
MultipartGenerator.registerTrait("cofh.api.energy.IEnergyHandler", "resonantinduction.transport.wire.trait.TraitEnergyHandler");
MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "resonantinduction.transport.wire.trait.TraitEnergySink");
MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "resonantinduction.electrical.wire.trait.TraitConductor");
MultipartGenerator.registerTrait("cofh.api.energy.IEnergyHandler", "resonantinduction.electrical.wire.trait.TraitEnergyHandler");
MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "resonantinduction.electrical.wire.trait.TraitEnergySink");
}
@Override

2
src/main/java/resonantinduction/old/energy/battery/BatteryStructure.java → src/main/java/resonantinduction/electrical/battery/BatteryStructure.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.battery;
package resonantinduction.electrical.battery;
import java.util.Arrays;

2
src/main/java/resonantinduction/old/energy/battery/BlockBattery.java → src/main/java/resonantinduction/electrical/battery/BlockBattery.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.old.energy.battery;
package resonantinduction.electrical.battery;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.entity.EntityLivingBase;

2
src/main/java/resonantinduction/old/energy/battery/ItemBlockBattery.java → src/main/java/resonantinduction/electrical/battery/ItemBlockBattery.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.battery;
package resonantinduction.electrical.battery;
import java.util.List;

2
src/main/java/resonantinduction/old/energy/battery/RenderBattery.java → src/main/java/resonantinduction/electrical/battery/RenderBattery.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.old.energy.battery;
package resonantinduction.electrical.battery;
import static org.lwjgl.opengl.GL11.glPopMatrix;
import static org.lwjgl.opengl.GL11.glPushMatrix;

2
src/main/java/resonantinduction/old/energy/battery/TileBattery.java → src/main/java/resonantinduction/electrical/battery/TileBattery.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.battery;
package resonantinduction.electrical.battery;
import java.util.ArrayList;
import java.util.HashSet;

2
src/main/java/resonantinduction/old/energy/fx/FXElectricBolt.java → src/main/java/resonantinduction/electrical/fx/FXElectricBolt.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.fx;
package resonantinduction.electrical.fx;
import static org.lwjgl.opengl.GL11.GL_BLEND;
import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;

3
src/main/java/resonantinduction/old/electrical/multimeter/ContainerMultimeter.java → src/main/java/resonantinduction/electrical/multimeter/ContainerMultimeter.java
View file

@ -1,13 +1,12 @@
/**
*
*/
package resonantinduction.old.electrical.multimeter;
package resonantinduction.electrical.multimeter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import resonantinduction.old.energy.multimeter.PartMultimeter;
/**
* @author Calclavia

3
src/main/java/resonantinduction/old/energy/multimeter/GuiMultimeter.java → src/main/java/resonantinduction/electrical/multimeter/GuiMultimeter.java
View file

@ -1,14 +1,13 @@
/**
*
*/
package resonantinduction.old.energy.multimeter;
package resonantinduction.electrical.multimeter;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
import resonantinduction.old.Reference;
import resonantinduction.old.electrical.multimeter.ContainerMultimeter;
import universalelectricity.api.energy.UnitDisplay.Unit;
import calclavia.lib.gui.GuiContainerBase;
import calclavia.lib.render.EnumColor;

5
src/main/java/resonantinduction/old/electrical/multimeter/ItemMultimeter.java → src/main/java/resonantinduction/electrical/multimeter/ItemMultimeter.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.electrical.multimeter;
package resonantinduction.electrical.multimeter;
import java.util.List;
@ -9,8 +9,7 @@ import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.prefab.part.ItemMultipartBase;
import resonantinduction.old.energy.multimeter.PartMultimeter;
import resonantinduction.old.energy.wire.EnumWireMaterial;
import resonantinduction.electrical.wire.EnumWireMaterial;
import calclavia.lib.utility.LanguageUtility;
import codechicken.lib.vec.BlockCoord;
import codechicken.lib.vec.Vector3;

2
src/main/java/resonantinduction/old/electrical/multimeter/ItemReadoutTools.java → src/main/java/resonantinduction/electrical/multimeter/ItemReadoutTools.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.electrical.multimeter;
package resonantinduction.electrical.multimeter;
import java.util.List;

2
src/main/java/resonantinduction/old/energy/multimeter/ModelMultimeter.java → src/main/java/resonantinduction/electrical/multimeter/ModelMultimeter.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.multimeter;
package resonantinduction.electrical.multimeter;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

7
src/main/java/resonantinduction/old/energy/multimeter/PartMultimeter.java → src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.old.energy.multimeter;
package resonantinduction.electrical.multimeter;
import java.util.ArrayList;
import java.util.Arrays;
@ -16,8 +16,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.ResonantInduction;
import resonantinduction.old.electrical.multimeter.RenderMultimeter;
import resonantinduction.old.energy.ResonantInductionEnergy;
import resonantinduction.electrical.Electrical;
import universalelectricity.api.CompatibilityModule;
import universalelectricity.api.energy.IConductor;
import universalelectricity.api.energy.IEnergyNetwork;
@ -351,7 +350,7 @@ public class PartMultimeter extends JCuboidPart implements IPacketReceiver, TFac
protected ItemStack getItem()
{
return new ItemStack(ResonantInductionEnergy.itemMultimeter);
return new ItemStack(Electrical.itemMultimeter);
}
@Override

4
src/main/java/resonantinduction/old/electrical/multimeter/RenderMultimeter.java → src/main/java/resonantinduction/electrical/multimeter/RenderMultimeter.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.electrical.multimeter;
package resonantinduction.electrical.multimeter;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
@ -8,8 +8,6 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import resonantinduction.old.Reference;
import resonantinduction.old.energy.multimeter.ModelMultimeter;
import resonantinduction.old.energy.multimeter.PartMultimeter;
import universalelectricity.api.energy.UnitDisplay;
import universalelectricity.api.energy.UnitDisplay.Unit;
import cpw.mods.fml.client.FMLClientHandler;

2
src/main/java/resonantinduction/old/energy/tesla/BlockTesla.java → src/main/java/resonantinduction/electrical/tesla/BlockTesla.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.old.energy.tesla;
package resonantinduction.electrical.tesla;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.entity.player.EntityPlayer;

2
src/main/java/resonantinduction/old/energy/tesla/ITesla.java → src/main/java/resonantinduction/electrical/tesla/ITesla.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.old.energy.tesla;
package resonantinduction.electrical.tesla;
import net.minecraft.tileentity.TileEntity;

2
src/main/java/resonantinduction/old/energy/tesla/ModelTeslaBottom.java → src/main/java/resonantinduction/electrical/tesla/ModelTeslaBottom.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.tesla;
package resonantinduction.electrical.tesla;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/old/energy/tesla/ModelTeslaMiddle.java → src/main/java/resonantinduction/electrical/tesla/ModelTeslaMiddle.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.tesla;
package resonantinduction.electrical.tesla;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/old/energy/tesla/ModelTeslaTop.java → src/main/java/resonantinduction/electrical/tesla/ModelTeslaTop.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.tesla;
package resonantinduction.electrical.tesla;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

2
src/main/java/resonantinduction/old/energy/tesla/RenderTesla.java → src/main/java/resonantinduction/electrical/tesla/RenderTesla.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.old.energy.tesla;
package resonantinduction.electrical.tesla;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;

2
src/main/java/resonantinduction/old/energy/tesla/TeslaGrid.java → src/main/java/resonantinduction/electrical/tesla/TeslaGrid.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.old.energy.tesla;
package resonantinduction.electrical.tesla;
import java.util.HashSet;
import java.util.Iterator;

14
src/main/java/resonantinduction/old/energy/tesla/TileTesla.java → src/main/java/resonantinduction/electrical/tesla/TileTesla.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package resonantinduction.old.energy.tesla;
package resonantinduction.electrical.tesla;
import java.util.ArrayList;
import java.util.Collections;
@ -21,8 +21,9 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings;
import resonantinduction.core.link.ILinkable;
import resonantinduction.electrical.Electrical;
import resonantinduction.old.Reference;
import resonantinduction.old.energy.ILinkable;
import universalelectricity.api.energy.EnergyStorageHandler;
import universalelectricity.api.vector.Vector3;
import universalelectricity.api.vector.VectorWorld;
@ -30,7 +31,9 @@ import calclavia.lib.CustomDamageSource;
import calclavia.lib.network.IPacketReceiver;
import calclavia.lib.network.IPacketSender;
import calclavia.lib.prefab.tile.TileElectrical;
import calclavia.lib.render.EnumColor;
import calclavia.lib.utility.LanguageUtility;
import codechicken.lib.colour.ColourRGBA;
import com.google.common.io.ByteArrayDataInput;
@ -137,7 +140,7 @@ public class TileTesla extends TileElectrical implements ITesla, IPacketSender,
}
else
{
ResonantInduction.proxy.renderElectricShock(this.worldObj, topTeslaVector.clone().translate(0.5), topTeslaVector.clone().translate(new Vector3(0.5, Double.POSITIVE_INFINITY, 0.5)), false);
Electrical.proxy.renderElectricShock(this.worldObj, topTeslaVector.clone().translate(0.5), topTeslaVector.clone().translate(new Vector3(0.5, Double.POSITIVE_INFINITY, 0.5)), false);
}
}
else
@ -218,7 +221,8 @@ public class TileTesla extends TileElectrical implements ITesla, IPacketSender,
}
double distance = topTeslaVector.distance(targetVector);
ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).translate(new Vector3(0.5)), targetVector.translate(new Vector3(0.5)), ResonantInduction.DYE_COLORS[this.dyeID]);
//TODO: Fix color.
Electrical.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).translate(new Vector3(0.5)), targetVector.translate(new Vector3(0.5)), new ColourRGBA(EnumColor.DYES[this.dyeID].toColor().getRGB()));
this.transfer(tesla, Math.min(transferEnergy, TRANSFER_CAP));
@ -236,7 +240,7 @@ public class TileTesla extends TileElectrical implements ITesla, IPacketSender,
if (mop.entityHit instanceof EntityLivingBase)
{
mop.entityHit.attackEntityFrom(CustomDamageSource.electrocution, 4);
ResonantInduction.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).clone().translate(0.5), new Vector3(mop.entityHit));
Electrical.proxy.renderElectricShock(this.worldObj, new Vector3(topTesla).clone().translate(0.5), new Vector3(mop.entityHit));
}
}
}

4
src/main/java/resonantinduction/old/energy/transformer/ItemTransformer.java → src/main/java/resonantinduction/electrical/transformer/ItemTransformer.java
View file

@ -1,11 +1,11 @@
package resonantinduction.old.energy.transformer;
package resonantinduction.electrical.transformer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import resonantinduction.core.prefab.part.ItemMultipartBase;
import resonantinduction.old.energy.wire.EnumWireMaterial;
import resonantinduction.electrical.wire.EnumWireMaterial;
import codechicken.lib.vec.BlockCoord;
import codechicken.lib.vec.Vector3;
import codechicken.multipart.MultiPartRegistry;

2
src/main/java/resonantinduction/old/energy/transformer/ModelTransformer.java → src/main/java/resonantinduction/electrical/transformer/ModelTransformer.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.transformer;
package resonantinduction.electrical.transformer;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;

6
src/main/java/resonantinduction/old/energy/transformer/PartTransformer.java → src/main/java/resonantinduction/electrical/transformer/PartTransformer.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.transformer;
package resonantinduction.electrical.transformer;
import java.lang.reflect.Method;
import java.util.ArrayList;
@ -11,7 +11,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.ResonantInduction;
import resonantinduction.electrical.Electrical;
import universalelectricity.api.electricity.IElectricalNetwork;
import universalelectricity.api.electricity.IVoltageInput;
import universalelectricity.api.electricity.IVoltageOutput;
@ -111,7 +111,7 @@ public class PartTransformer extends JCuboidPart implements JNormalOcclusion, TF
protected ItemStack getItem()
{
return new ItemStack(ResonantInduction.itemTransformer);
return new ItemStack(Electrical.itemTransformer);
}
@Override

2
src/main/java/resonantinduction/old/energy/transformer/RenderTransformer.java → src/main/java/resonantinduction/electrical/transformer/RenderTransformer.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.transformer;
package resonantinduction.electrical.transformer;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;

2
src/main/java/resonantinduction/old/energy/wire/EnumWireMaterial.java → src/main/java/resonantinduction/electrical/wire/EnumWireMaterial.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire;
package resonantinduction.electrical.wire;
import net.minecraft.block.Block;
import net.minecraft.item.Item;

12
src/main/java/resonantinduction/old/energy/wire/ItemWire.java → src/main/java/resonantinduction/electrical/wire/ItemWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire;
package resonantinduction.electrical.wire;
import java.util.List;
@ -16,11 +16,11 @@ import org.lwjgl.input.Keyboard;
import resonantinduction.core.ResonantInductionTabs;
import resonantinduction.core.Settings;
import resonantinduction.core.Utility;
import resonantinduction.electrical.wire.flat.PartFlatWire;
import resonantinduction.electrical.wire.flat.RenderFlatWire;
import resonantinduction.electrical.wire.framed.PartFramedWire;
import resonantinduction.electrical.wire.framed.RenderPartWire;
import resonantinduction.old.Reference;
import resonantinduction.old.energy.wire.flat.PartFlatWire;
import resonantinduction.old.energy.wire.flat.RenderFlatWire;
import resonantinduction.old.energy.wire.framed.PartFramedWire;
import resonantinduction.old.energy.wire.framed.RenderPartWire;
import universalelectricity.api.energy.UnitDisplay;
import universalelectricity.api.energy.UnitDisplay.Unit;
import calclavia.lib.render.EnumColor;
@ -33,7 +33,7 @@ import codechicken.multipart.MultiPartRegistry;
import codechicken.multipart.TMultiPart;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
//TODO: AUTO COLOR WIRES!
public class ItemWire extends JItemMultiPart
{
private Icon[] icons = new Icon[EnumWireMaterial.values().length];

2
src/main/java/resonantinduction/old/energy/wire/PartAdvancedWire.java → src/main/java/resonantinduction/electrical/wire/PartAdvancedWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire;
package resonantinduction.electrical.wire;
import java.util.ArrayList;
import java.util.Collections;

2
src/main/java/resonantinduction/old/energy/wire/PartConductor.java → src/main/java/resonantinduction/electrical/wire/PartConductor.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire;
package resonantinduction.electrical.wire;
import ic2.api.energy.event.EnergyTileLoadEvent;
import ic2.api.energy.event.EnergyTileUnloadEvent;

2
src/main/java/resonantinduction/old/energy/wire/flat/PartFlatSwitchWire.java → src/main/java/resonantinduction/electrical/wire/flat/PartFlatSwitchWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire.flat;
package resonantinduction.electrical.wire.flat;
import java.util.Collections;
import java.util.List;

11
src/main/java/resonantinduction/old/energy/wire/flat/PartFlatWire.java → src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire.flat;
package resonantinduction.electrical.wire.flat;
import java.util.Arrays;
@ -15,11 +15,12 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Utility;
import resonantinduction.old.energy.wire.EnumWireMaterial;
import resonantinduction.old.energy.wire.PartAdvancedWire;
import resonantinduction.electrical.wire.EnumWireMaterial;
import resonantinduction.electrical.wire.PartAdvancedWire;
import calclavia.lib.render.EnumColor;
import codechicken.lib.colour.Colour;
import codechicken.lib.colour.ColourRGBA;
import codechicken.lib.data.MCDataInput;
import codechicken.lib.data.MCDataOutput;
import codechicken.lib.lighting.LazyLightMatrix;
@ -894,7 +895,7 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal
public Colour getColour()
{
return this.isInsulated ? ResonantInduction.DYE_COLORS[this.color] : this.getMaterial().color;
return this.isInsulated ? new ColourRGBA(EnumColor.DYES[this.color].toColor().getRGB()) : this.getMaterial().color;
}
public boolean useStaticRenderer()

2
src/main/java/resonantinduction/old/energy/wire/flat/RenderFlatWire.java → src/main/java/resonantinduction/electrical/wire/flat/RenderFlatWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire.flat;
package resonantinduction.electrical.wire.flat;
import java.util.Arrays;
import java.util.LinkedList;

2
src/main/java/resonantinduction/old/energy/wire/framed/PartFramedSwitchWire.java → src/main/java/resonantinduction/electrical/wire/framed/PartFramedSwitchWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire.framed;
package resonantinduction.electrical.wire.framed;
import java.util.Collections;
import java.util.List;

6
src/main/java/resonantinduction/old/energy/wire/framed/PartFramedWire.java → src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire.framed;
package resonantinduction.electrical.wire.framed;
import java.util.Collection;
import java.util.HashSet;
@ -14,8 +14,8 @@ import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.old.energy.wire.EnumWireMaterial;
import resonantinduction.old.energy.wire.PartAdvancedWire;
import resonantinduction.electrical.wire.EnumWireMaterial;
import resonantinduction.electrical.wire.PartAdvancedWire;
import universalelectricity.api.CompatibilityModule;
import universalelectricity.api.energy.IConductor;
import universalelectricity.api.vector.Vector3;

8
src/main/java/resonantinduction/old/energy/wire/framed/RenderPartWire.java → src/main/java/resonantinduction/electrical/wire/framed/RenderPartWire.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire.framed;
package resonantinduction.electrical.wire.framed;
import java.nio.FloatBuffer;
import java.util.Map;
@ -11,10 +11,12 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import calclavia.lib.render.EnumColor;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.render.InvertX;
import resonantinduction.old.Reference;
import resonantinduction.old.core.render.InvertX;
import codechicken.lib.colour.Colour;
import codechicken.lib.colour.ColourRGBA;
import codechicken.lib.lighting.LightModel;
import codechicken.lib.render.CCModel;
import codechicken.lib.render.CCRenderState;
@ -165,7 +167,7 @@ public class RenderPartWire
if (wire.isInsulated())
{
Colour insulationColour = ResonantInduction.DYE_COLORS[wire.getColor()];
Colour insulationColour = new ColourRGBA(EnumColor.DYES[wire.getColor()].toColor().getRGB());
renderPart(insulationIcon, models.get(name + "Insulation"), wire.x(), wire.y(), wire.z(), insulationColour);
}
}

2
src/main/java/resonantinduction/old/energy/wire/trait/TraitConductor.java → src/main/java/resonantinduction/electrical/wire/trait/TraitConductor.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire.trait;
package resonantinduction.electrical.wire.trait;
import java.util.HashSet;
import java.util.Set;

4
src/main/java/resonantinduction/old/energy/wire/trait/TraitEnergyHandler.java → src/main/java/resonantinduction/electrical/wire/trait/TraitEnergyHandler.java
View file

@ -1,10 +1,10 @@
package resonantinduction.old.energy.wire.trait;
package resonantinduction.electrical.wire.trait;
import java.util.HashSet;
import java.util.Set;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.old.energy.wire.PartConductor;
import resonantinduction.electrical.wire.PartConductor;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import cofh.api.energy.IEnergyHandler;

2
src/main/java/resonantinduction/old/energy/wire/trait/TraitEnergySink.java → src/main/java/resonantinduction/electrical/wire/trait/TraitEnergySink.java
View file

@ -1,4 +1,4 @@
package resonantinduction.old.energy.wire.trait;
package resonantinduction.electrical.wire.trait;
import ic2.api.energy.tile.IEnergySink;

8
src/main/java/resonantinduction/old/core/render/BlockRenderingHandler.java
View file

@ -12,10 +12,10 @@ import static org.lwjgl.opengl.GL11.glTranslatef;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;
import resonantinduction.old.energy.battery.BlockBattery;
import resonantinduction.old.energy.battery.RenderBattery;
import resonantinduction.old.energy.tesla.BlockTesla;
import resonantinduction.old.energy.tesla.RenderTesla;
import resonantinduction.electrical.battery.BlockBattery;
import resonantinduction.electrical.battery.RenderBattery;
import resonantinduction.electrical.tesla.BlockTesla;
import resonantinduction.electrical.tesla.RenderTesla;
import resonantinduction.old.transport.levitator.BlockLevitator;
import resonantinduction.old.transport.levitator.RenderLevitator;
import cpw.mods.fml.client.FMLClientHandler;

8
src/main/java/resonantinduction/old/core/render/RenderRIItem.java
View file

@ -5,10 +5,10 @@ import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import resonantinduction.old.electrical.multimeter.ItemMultimeter;
import resonantinduction.old.electrical.multimeter.RenderMultimeter;
import resonantinduction.old.energy.transformer.ItemTransformer;
import resonantinduction.old.energy.transformer.RenderTransformer;
import resonantinduction.electrical.multimeter.ItemMultimeter;
import resonantinduction.electrical.multimeter.RenderMultimeter;
import resonantinduction.electrical.transformer.ItemTransformer;
import resonantinduction.electrical.transformer.RenderTransformer;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

6
src/main/java/resonantinduction/old/mechanics/ClientProxy.java
View file

@ -4,10 +4,10 @@ import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.electrical.fx.FXElectricBolt;
import resonantinduction.electrical.multimeter.GuiMultimeter;
import resonantinduction.electrical.multimeter.PartMultimeter;
import resonantinduction.old.core.render.BlockRenderingHandler;
import resonantinduction.old.energy.fx.FXElectricBolt;
import resonantinduction.old.energy.multimeter.GuiMultimeter;
import resonantinduction.old.energy.multimeter.PartMultimeter;
import universalelectricity.api.vector.Vector3;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;

4
src/main/java/resonantinduction/old/mechanics/CommonProxy.java
View file

@ -6,8 +6,8 @@ package resonantinduction.old.mechanics;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import resonantinduction.old.electrical.multimeter.ContainerMultimeter;
import resonantinduction.old.energy.multimeter.PartMultimeter;
import resonantinduction.electrical.multimeter.ContainerMultimeter;
import resonantinduction.electrical.multimeter.PartMultimeter;
import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart;
import cpw.mods.fml.common.network.IGuiHandler;

6
src/main/java/resonantinduction/old/mechanics/ResonantInductionMechanics.java
View file

@ -19,10 +19,10 @@ import org.modstats.Modstats;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings;
import resonantinduction.core.prefab.part.PacketMultiPart;
import resonantinduction.core.resource.ResourceGenerator;
import resonantinduction.electrical.MultipartElectrical;
import resonantinduction.old.Reference;
import resonantinduction.old.core.multipart.MultipartRI;
import resonantinduction.old.core.multipart.PacketMultiPart;
import resonantinduction.old.mechanics.furnace.BlockAdvancedFurnace;
import resonantinduction.old.mechanics.furnace.TileAdvancedFurnace;
import resonantinduction.old.mechanics.item.ItemDust;
@ -147,7 +147,7 @@ public class ResonantInductionMechanics
metadata.credits = LanguageUtility.getLocal("meta.resonantinduction.credits");
metadata.autogenerated = false;
MultipartRI.INSTANCE = new MultipartRI();
MultipartElectrical.INSTANCE = new MultipartElectrical();
}
@EventHandler

2
src/main/java/resonantinduction/old/transport/ResonantInductionTransport.java
View file

@ -21,6 +21,7 @@ import resonantinduction.core.network.PacketIDTile;
import resonantinduction.core.resource.ItemBlockOre;
import resonantinduction.core.resource.ItemParts;
import resonantinduction.core.resource.ItemParts.Parts;
import resonantinduction.electrical.multimeter.ItemReadoutTools;
import resonantinduction.old.api.coding.TaskRegistry;
import resonantinduction.old.blocks.BlockColorGlass;
import resonantinduction.old.blocks.BlockColorGlowGlass;
@ -39,7 +40,6 @@ import resonantinduction.old.core.misc.ItemColoredDust;
import resonantinduction.old.core.misc.ItemCommonTool;
import resonantinduction.old.core.misc.ItemFarmEgg;
import resonantinduction.old.core.recipe.RecipeLoader;
import resonantinduction.old.electrical.multimeter.ItemReadoutTools;
import resonantinduction.old.lib.CoreRegistry;
import resonantinduction.old.lib.EnumMaterial;
import resonantinduction.old.lib.EnumOrePart;

6
src/main/java/resonantinduction/old/transport/levitator/TileEMLevitator.java
View file

@ -23,8 +23,8 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.IFluidBlock;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings;
import resonantinduction.old.energy.ILinkable;
import resonantinduction.old.energy.tesla.TileTesla;
import resonantinduction.core.link.ILinkable;
import resonantinduction.electrical.tesla.TileTesla;
import universalelectricity.api.vector.Vector3;
import universalelectricity.api.vector.VectorWorld;
import calclavia.lib.network.IPacketReceiver;
@ -143,7 +143,7 @@ public class TileEMLevitator extends TileAdvanced implements IPacketReceiver, IP
}
}
final int renderFrequency = ResonantInduction.proxy.isFancy() ? 1 + worldObj.rand.nextInt(2) : 10 + worldObj.rand.nextInt(2);
final int renderFrequency = ResonantInduction.proxy.isGraphicsFancy() ? 1 + worldObj.rand.nextInt(2) : 10 + worldObj.rand.nextInt(2);
final boolean renderBeam = ticks % renderFrequency == 0 && hasLink() && linked.suck != suck;
if (hasLink())