Reverted to Java 6 for FTB

This commit is contained in:
Calclavia 2014-01-25 11:34:01 +08:00
parent f5a055b615
commit bf574c7c8c
9 changed files with 40 additions and 30 deletions

View file

@ -21,8 +21,6 @@ buildProps.withReader {
ext.config = new ConfigSlurper().parse prop ext.config = new ConfigSlurper().parse prop
} }
sourceCompatibility = 1.7
targetCompatibility = 1.7
version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}" version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}"
group = "resonantinduction" group = "resonantinduction"
archivesBaseName = "Resonant-Induction" archivesBaseName = "Resonant-Induction"

View file

@ -26,7 +26,7 @@ public class BlockTurntable extends BlockRIRotatable
super("turntable"); super("turntable");
setTextureName(Reference.PREFIX + "turntable_side"); setTextureName(Reference.PREFIX + "turntable_side");
setTickRandomly(true); setTickRandomly(true);
rotationMask = 0b111111; rotationMask = Byte.parseByte("111111", 2);
} }
@Override @Override

View file

@ -6,6 +6,8 @@ import resonantinduction.electrical.wire.flat.PartFlatSwitchWire;
import resonantinduction.electrical.wire.flat.PartFlatWire; import resonantinduction.electrical.wire.flat.PartFlatWire;
import resonantinduction.electrical.wire.framed.PartFramedSwitchWire; import resonantinduction.electrical.wire.framed.PartFramedSwitchWire;
import resonantinduction.electrical.wire.framed.PartFramedWire; import resonantinduction.electrical.wire.framed.PartFramedWire;
import resonantinduction.mechanical.fluid.pipe.PartPipe;
import resonantinduction.mechanical.gear.PartGear;
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;
@ -28,20 +30,29 @@ public class MultipartElectrical implements IPartFactory
@Override @Override
public TMultiPart createPart(String name, boolean client) public TMultiPart createPart(String name, boolean client)
{ {
switch (name) if (name.equals("resonant_induction_wire"))
{ {
case "resonant_induction_wire": return new PartFramedWire();
return new PartFramedWire(); }
case "resonant_induction_switch_wire": else if (name.equals("resonant_induction_switch_wire"))
return new PartFramedSwitchWire(); {
case "resonant_induction_flat_wire": return new PartFramedSwitchWire();
return new PartFlatWire(); }
case "resonant_induction_flat_switch_wire": else if (name.equals("resonant_induction_flat_wire"))
return new PartFlatSwitchWire(); {
case "resonant_induction_multimeter": return new PartFlatWire();
return new PartMultimeter(); }
case "resonant_induction_transformer": else if (name.equals("resonant_induction_flat_switch_wire"))
return new PartTransformer(); {
return new PartFlatSwitchWire();
}
else if (name.equals("resonant_induction_multimeter"))
{
return new PartMultimeter();
}
else if (name.equals("resonant_induction_transformer"))
{
return new PartTransformer();
} }
return null; return null;

View file

@ -15,7 +15,7 @@ public class BlockGenerator extends BlockRIRotatable
{ {
super("generator"); super("generator");
setTextureName(Reference.PREFIX + "material_steel"); setTextureName(Reference.PREFIX + "material_steel");
rotationMask = 0b111111; rotationMask = Byte.parseByte("111111", 2);
} }
@Override @Override

View file

@ -23,12 +23,13 @@ public class MultipartMechanical implements IPartFactory
@Override @Override
public TMultiPart createPart(String name, boolean client) public TMultiPart createPart(String name, boolean client)
{ {
switch (name) if (name.equals("resonant_induction_gear"))
{ {
case "resonant_induction_gear": return new PartGear();
return new PartGear(); }
case "resonant_induction_pipe": else if (name.equals("resonant_induction_pipe"))
return new PartPipe(); {
return new PartPipe();
} }
return null; return null;

View file

@ -33,26 +33,26 @@ public class ItemPipeRenderer implements IItemRenderer
if (type == ItemRenderType.ENTITY) if (type == ItemRenderType.ENTITY)
{ {
GL11.glTranslatef(-.5F, -1F, -.5F); GL11.glTranslatef(-.5F, -1F, -.5F);
RenderPipe.render(meta, (byte) 0b001100); RenderPipe.render(meta, Byte.parseByte("001100", 2));
} }
else if (type == ItemRenderType.INVENTORY) else if (type == ItemRenderType.INVENTORY)
{ {
GL11.glTranslatef(0F, -1F, 0F); GL11.glTranslatef(0F, -1F, 0F);
RenderPipe.render(meta, (byte) 0b001100); RenderPipe.render(meta, Byte.parseByte("001100", 2));
} }
else if (type == ItemRenderType.EQUIPPED) else if (type == ItemRenderType.EQUIPPED)
{ {
GL11.glTranslatef(-1F, -1.2F, 0.5F); GL11.glTranslatef(-1F, -1.2F, 0.5F);
RenderPipe.render(meta, (byte) 0b000011); RenderPipe.render(meta, Byte.parseByte("000011", 2));
} }
else if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) else if (type == ItemRenderType.EQUIPPED_FIRST_PERSON)
{ {
GL11.glTranslatef(-2F, -1.5F, 0.2F); GL11.glTranslatef(-2F, -1.5F, 0.2F);
RenderPipe.render(meta, (byte) 0b000011); RenderPipe.render(meta, Byte.parseByte("000011", 2));
} }
else else
{ {
RenderPipe.render(item.getItemDamage(), (byte) 0b000011); RenderPipe.render(item.getItemDamage(), Byte.parseByte("000011", 2));
} }
GL11.glPopMatrix(); GL11.glPopMatrix();

View file

@ -52,7 +52,7 @@ public abstract class TileFluidNetwork extends TileAdvanced implements IFluidCon
public static final int PACKET_TANK = Mechanical.contentRegistry.getNextPacketID(); public static final int PACKET_TANK = Mechanical.contentRegistry.getNextPacketID();
/** Bitmask that handles connections for the renderer **/ /** Bitmask that handles connections for the renderer **/
public byte renderSides = 0b0; public byte renderSides = 0;
@Override @Override
public void initiate() public void initiate()

View file

@ -21,7 +21,7 @@ public class BlockGrate extends BlockRIRotatable
public BlockGrate() public BlockGrate()
{ {
super("grate"); super("grate");
rotationMask = 0b111111; rotationMask = Byte.parseByte("111111", 2);
} }
@Override @Override

View file

@ -27,7 +27,7 @@ public class BlockGrinderWheel extends BlockRIRotatable implements ITileEntityPr
super("grindingWheel", Settings.getNextBlockID()); super("grindingWheel", Settings.getNextBlockID());
setTextureName(Reference.PREFIX + "material_steel_dark"); setTextureName(Reference.PREFIX + "material_steel_dark");
setBlockBounds(0.05f, 0.05f, 0.05f, 0.95f, 0.95f, 0.95f); setBlockBounds(0.05f, 0.05f, 0.05f, 0.95f, 0.95f, 0.95f);
rotationMask = 0b111111; rotationMask = Byte.parseByte("111111", 2);
} }
@Override @Override