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

MultipartRI is refactor-proof, and move ItemDust

Browse source
This commit is contained in:
Alex_hawks 2014-01-06 19:47:27 +08:00
parent c9bd412bb8
commit 76ed58c305
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import resonantinduction.core.render.BlockRenderingHandler; import resonantinduction.core.render.BlockRenderingHandler;
import resonantinduction.core.render.RenderRIItem; import resonantinduction.core.render.RenderRIItem;
import resonantinduction.machine.grinder.ItemDust; import resonantinduction.machine.item.ItemDust;
import resonantinduction.transport.battery.RenderBattery; import resonantinduction.transport.battery.RenderBattery;
import resonantinduction.transport.battery.TileBattery; import resonantinduction.transport.battery.TileBattery;
import resonantinduction.transport.fx.FXElectricBolt; import resonantinduction.transport.fx.FXElectricBolt;

12
src/main/java/resonantinduction/MultipartRI.java
View file

@ -1,15 +1,21 @@
package resonantinduction; package resonantinduction;
import ic2.api.energy.tile.IEnergySink;
import resonantinduction.transport.transformer.PartTransformer; import resonantinduction.transport.transformer.PartTransformer;
import resonantinduction.transport.wire.flat.PartFlatSwitchWire; import resonantinduction.transport.wire.flat.PartFlatSwitchWire;
import resonantinduction.transport.wire.flat.PartFlatWire; import resonantinduction.transport.wire.flat.PartFlatWire;
import resonantinduction.transport.wire.framed.PartFramedSwitchWire; import resonantinduction.transport.wire.framed.PartFramedSwitchWire;
import resonantinduction.transport.wire.framed.PartFramedWire; import resonantinduction.transport.wire.framed.PartFramedWire;
import resonantinduction.transport.wire.trait.TraitConductor;
import resonantinduction.transport.wire.trait.TraitEnergyHandler;
import resonantinduction.transport.wire.trait.TraitEnergySink;
import resonantinduction.utility.multimeter.PartMultimeter; import resonantinduction.utility.multimeter.PartMultimeter;
import universalelectricity.api.energy.IConductor;
import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry;
import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultiPartRegistry.IPartFactory;
import codechicken.multipart.MultipartGenerator; import codechicken.multipart.MultipartGenerator;
import codechicken.multipart.TMultiPart; import codechicken.multipart.TMultiPart;
import cofh.api.energy.IEnergyHandler;
public class MultipartRI implements IPartFactory public class MultipartRI implements IPartFactory
{ {
@ -20,9 +26,9 @@ public class MultipartRI implements IPartFactory
public MultipartRI() public MultipartRI()
{ {
MultiPartRegistry.registerParts(this, PART_TYPES); MultiPartRegistry.registerParts(this, PART_TYPES);
MultipartGenerator.registerTrait("universalelectricity.api.energy.IConductor", "resonantinduction.transport.wire.trait.TraitConductor"); MultipartGenerator.registerTrait(IConductor.class.getCanonicalName(), TraitConductor.class.getCanonicalName());
MultipartGenerator.registerTrait("cofh.api.energy.IEnergyHandler", "resonantinduction.transport.wire.trait.TraitEnergyHandler"); MultipartGenerator.registerTrait(IEnergyHandler.class.getCanonicalName(), TraitEnergyHandler.class.getCanonicalName());
MultipartGenerator.registerTrait("ic2.api.energy.tile.IEnergySink", "resonantinduction.transport.wire.trait.TraitEnergySink"); MultipartGenerator.registerTrait(IEnergySink.class.getCanonicalName(), TraitEnergySink.class.getCanonicalName());
} }
@Override @Override

2
src/main/java/resonantinduction/ResonantInduction.java
View file

@ -30,8 +30,8 @@ import resonantinduction.machine.BlockMachinePart;
import resonantinduction.machine.furnace.BlockAdvancedFurnace; import resonantinduction.machine.furnace.BlockAdvancedFurnace;
import resonantinduction.machine.furnace.TileAdvancedFurnace; import resonantinduction.machine.furnace.TileAdvancedFurnace;
import resonantinduction.machine.grinder.BlockGrinderWheel; import resonantinduction.machine.grinder.BlockGrinderWheel;
import resonantinduction.machine.grinder.ItemDust;
import resonantinduction.machine.grinder.TileGrinderWheel; import resonantinduction.machine.grinder.TileGrinderWheel;
import resonantinduction.machine.item.ItemDust;
import resonantinduction.machine.liquid.BlockFluidMixture; import resonantinduction.machine.liquid.BlockFluidMixture;
import resonantinduction.machine.liquid.TileFluidMixture; import resonantinduction.machine.liquid.TileFluidMixture;
import resonantinduction.transport.battery.BlockBattery; import resonantinduction.transport.battery.BlockBattery;

2
src/main/java/resonantinduction/machine/grinder/ItemDust.java → src/main/java/resonantinduction/machine/item/ItemDust.java
View file

@ -1,4 +1,4 @@
package resonantinduction.machine.grinder; package resonantinduction.machine.item;
import java.awt.Color; import java.awt.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;