Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

AutoSync

Browse source
This commit is contained in:
DarkGuardsman 2013-09-22 00:07:10 -04:00
parent b4b8f857d1
commit eb8dba750e
14 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dark/api/ColorCode.java
View file

@ -23,7 +23,6 @@ public enum ColorCode
WHITE("White", Color.white),
UNKOWN("", Color.BLACK);
public String name;
public Color color;

1
src/dark/api/ProcessorRecipes.java
View file

@ -158,6 +158,7 @@ public class ProcessorRecipes
}
}
}
/** Marks an itemstack as unsalvagable by processors */
public static void markUnsalvagable(ProcessorType type, ItemStack stack)
{

3
src/dark/core/client/ClientProxy.java
View file

@ -13,11 +13,10 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.client.renders.BlockRenderingHandler;
import dark.core.client.renders.RenderBlockWire;
import dark.core.client.renders.RenderBlockSolarPanel;
import dark.core.client.renders.RenderBlockWire;
import dark.core.common.CommonProxy;
import dark.core.common.CoreRecipeLoader;
import dark.core.common.DarkMain;
import dark.core.common.machines.TileEntityBatteryBox;
import dark.core.common.machines.TileEntityCoalGenerator;
import dark.core.common.machines.TileEntityElectricFurnace;

1
src/dark/core/client/models/ModelElecFurnace.java
View file

@ -8,7 +8,6 @@ package dark.core.client.models;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelElecFurnace extends ModelBase
{

2
src/dark/core/common/CoreRecipeLoader.java
View file

@ -44,7 +44,7 @@ public class CoreRecipeLoader extends RecipeLoader
{
super.loadRecipes();
new RecipeGrid(new ItemStack(itemTool, 1, 0), 3, 2).setRowOne("ironTube", "valvePart", "ironTube").setRowTwo(null, "ironTube", null).RegisterRecipe();
new RecipeGrid(new ItemStack(blockSolar, 1, 0), 3, 3).setRowOne(Block.glass, Block.glass, Block.glass).setRowTwo(this.steel, this.circuit, this.steel).setRowThree(this.steel, "copperWire", this.steel).RegisterRecipe();
new RecipeGrid(new ItemStack(blockSolar, 1, 0), 3, 3).setRowOne(Block.glass, Block.glass, Block.glass).setRowTwo(RecipeLoader.steel, RecipeLoader.circuit, RecipeLoader.steel).setRowThree(RecipeLoader.steel, "copperWire", RecipeLoader.steel).RegisterRecipe();
this.loadParts();
}

6
src/dark/core/common/DarkMain.java
View file

@ -187,9 +187,9 @@ public class DarkMain extends ModPrefab
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
{
this.zeroAnimation = CONFIGURATION.get("Graphics", "DisableAllAnimation", false, "Disables active animations by any non-active models").getBoolean(false);
this.zeroRendering = CONFIGURATION.get("Graphics", "DisableAllRendering", false, "Replaces all model renderers with single block forms").getBoolean(false);
this.zeroGraphics = CONFIGURATION.get("Graphics", "DisableAllGraphics", false, "Disables extra effects that models and renders have. Such as particles, and text").getBoolean(false);
DarkMain.zeroAnimation = CONFIGURATION.get("Graphics", "DisableAllAnimation", false, "Disables active animations by any non-active models").getBoolean(false);
DarkMain.zeroRendering = CONFIGURATION.get("Graphics", "DisableAllRendering", false, "Replaces all model renderers with single block forms").getBoolean(false);
DarkMain.zeroGraphics = CONFIGURATION.get("Graphics", "DisableAllGraphics", false, "Disables extra effects that models and renders have. Such as particles, and text").getBoolean(false);
}
/* BLOCKS */
Block m = ModObjectRegistry.createNewBlock("DMBlockMulti", DarkMain.MOD_ID, BlockMulti.class, false);

2
src/dark/core/common/items/ItemOreDirv.java
View file

@ -67,7 +67,7 @@ public class ItemOreDirv extends ItemBasic
{
for (EnumOrePart part : EnumOrePart.values())
{
ItemStack stack = mat.getStack(mat, part, 1);
ItemStack stack = EnumMaterial.getStack(mat, part, 1);
if (stack != null && mat.shouldCreateItem(part) && mat.itemIcons[part.ordinal()] != null)
{
par3List.add(stack);

1
src/dark/core/common/machines/BlockSolarPanel.java
View file

@ -28,6 +28,7 @@ public class BlockSolarPanel extends BlockMachine
this.setCreativeTab(DMCreativeTab.tabIndustrial);
}
@Override
public TileEntity createNewTileEntity(World world)
{
return new TileEntitySolarPanel();

1
src/dark/core/common/machines/TileEntitySolarPanel.java
View file

@ -55,6 +55,7 @@ public class TileEntitySolarPanel extends TileEntityEnergyMachine
}
@Override
public EnumSet<ForgeDirection> getOutputDirections()
{
return EnumSet.allOf(ForgeDirection.class);