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

moved BlockMachine prefab to core lib

Browse source 
Also renamed DarkMain to CoreMachine
This commit is contained in:
Robert 2013-12-19 20:56:48 -05:00
parent 3bc02d8a77
commit fbe8f627bd
51 changed files with 181 additions and 238 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CoreLibrary

@ -1 +1 @@
Subproject commit 7449c78567876047b6b427c6297a45e46e4689d7
Subproject commit b7d6a8c6cf24a013c68d5b9fe4153d7a5a585452

2
src/dark/api/ISentryGun.java
View file

@ -1,9 +1,9 @@
package dark.api;
import com.dark.interfaces.IBlockActivated;
import com.dark.interfaces.IControlReceiver;
import net.minecraft.tileentity.TileEntity;
import dark.core.interfaces.IBlockActivated;
import dark.core.interfaces.IDamageableTile;
/** Applied to tile entities that are sentry guns

10
src/dark/core/basics/BlockGasOre.java
View file

@ -22,12 +22,12 @@ import net.minecraftforge.fluids.IFluidBlock;
import universalelectricity.core.vector.Vector3;
import com.dark.DarkCore;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
import com.dark.fluid.EnumGas;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Gas that is designed to generate underground in the same way as an ore
*
@ -42,9 +42,9 @@ public class BlockGasOre extends Block implements IFluidBlock
public BlockGasOre()
{
super(DarkMain.CONFIGURATION.getBlock("GasBlock", DarkCore.getNextID()).getInt(), gas);
super(CoreMachine.CONFIGURATION.getBlock("GasBlock", DarkCore.getNextID()).getInt(), gas);
this.setUnlocalizedName("DMBlockGas");
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
this.setCreativeTab(IndustryTabs.tabIndustrial());
this.setTickRandomly(true);
}
@ -147,7 +147,7 @@ public class BlockGasOre extends Block implements IFluidBlock
@Override
public void registerIcons(IconRegister par1IconRegister)
{
this.blockIcon = par1IconRegister.registerIcon(DarkMain.getInstance().PREFIX + "gas");
this.blockIcon = par1IconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "gas");
}
@Override

10
src/dark/core/basics/BlockOre.java
View file

@ -23,7 +23,7 @@ import com.dark.IExtraInfo.IExtraBlockInfo;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.CoreRecipeLoader;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class BlockOre extends Block implements IExtraBlockInfo
{
@ -31,9 +31,9 @@ public class BlockOre extends Block implements IExtraBlockInfo
public BlockOre()
{
super(DarkMain.CONFIGURATION.getBlock("Ore", DarkCore.getNextID()).getInt(), Material.rock);
super(CoreMachine.CONFIGURATION.getBlock("Ore", DarkCore.getNextID()).getInt(), Material.rock);
this.setCreativeTab(CreativeTabs.tabBlock);
this.setUnlocalizedName(DarkMain.getInstance().PREFIX + "Ore");
this.setUnlocalizedName(CoreMachine.getInstance().PREFIX + "Ore");
this.setHardness(2.5f);
this.setResistance(5.0f);
@ -64,7 +64,7 @@ public class BlockOre extends Block implements IExtraBlockInfo
{
for (OreData data : OreData.values())
{
data.oreIcon = par1IconRegister.registerIcon(DarkMain.getInstance().PREFIX + data.name + "Ore");
data.oreIcon = par1IconRegister.registerIcon(CoreMachine.getInstance().PREFIX + data.name + "Ore");
}
}
@ -123,7 +123,7 @@ public class BlockOre extends Block implements IExtraBlockInfo
if (this.doWorldGen)
{
ItemStack stack = new ItemStack(CoreRecipeLoader.blockOre, 1, this.ordinal());
return (OreGenReplaceStone) new OreGenReplaceStone(this.name, this.name + "Ore", stack, this.maxY, this.ammount, this.branch).enable(DarkMain.getInstance().CONFIGURATION);
return (OreGenReplaceStone) new OreGenReplaceStone(this.name, this.name + "Ore", stack, this.maxY, this.ammount, this.branch).enable(CoreMachine.getInstance().CONFIGURATION);
}
return null;
}

4
src/dark/core/basics/ItemBlockOre.java
View file

@ -3,7 +3,7 @@ package dark.core.basics;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import dark.core.basics.BlockOre.OreData;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class ItemBlockOre extends ItemBlock
{
@ -26,7 +26,7 @@ public class ItemBlockOre extends ItemBlock
{
if (par1ItemStack != null && par1ItemStack.getItemDamage() < OreData.values().length)
{
return "tile." + DarkMain.getInstance().PREFIX + OreData.values()[par1ItemStack.getItemDamage()].name + "Ore";
return "tile." + CoreMachine.getInstance().PREFIX + OreData.values()[par1ItemStack.getItemDamage()].name + "Ore";
}
return super.getUnlocalizedName();
}

8
src/dark/core/basics/ItemCommonTool.java
View file

@ -37,7 +37,7 @@ import com.google.common.collect.Multimap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Flexible tool class that uses NBT to store damage and effect rather than metadata. Metadata
* instead is used to store sub items allowing several different tools to exist within the same item
@ -54,7 +54,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
public ItemCommonTool()
{
super(DarkMain.CONFIGURATION.getItem("Items", "CommonTools", DarkCore.getNextItemId()).getInt());
super(CoreMachine.CONFIGURATION.getItem("Items", "CommonTools", DarkCore.getNextItemId()).getInt());
this.maxStackSize = 1;
this.setCreativeTab(CreativeTabs.tabTools);
}
@ -434,7 +434,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
{
if (itemStack != null)
{
return "item." + DarkMain.getInstance().PREFIX + EnumTool.getFullName(itemStack.getItemDamage());
return "item." + CoreMachine.getInstance().PREFIX + EnumTool.getFullName(itemStack.getItemDamage());
}
else
{
@ -473,7 +473,7 @@ public class ItemCommonTool extends Item implements IExtraItemInfo
{
if (tool.enabled)
{
mat.toolIcons[tool.ordinal()] = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "tool." + mat.simpleName + tool.name);
mat.toolIcons[tool.ordinal()] = iconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "tool." + mat.simpleName + tool.name);
}
}
}

8
src/dark/core/basics/ItemOreDirv.java
View file

@ -18,7 +18,7 @@ import com.dark.prefab.ItemBasic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.events.LaserEvent;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** A series of items that are derived from a basic material
*
@ -27,7 +27,7 @@ public class ItemOreDirv extends ItemBasic implements IExtraItemInfo
{
public ItemOreDirv()
{
super(DarkCore.getNextItemId(), "Metal_Parts", DarkMain.CONFIGURATION);
super(DarkCore.getNextItemId(), "Metal_Parts", CoreMachine.CONFIGURATION);
this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabMaterials);
}
@ -37,7 +37,7 @@ public class ItemOreDirv extends ItemBasic implements IExtraItemInfo
{
if (itemStack != null)
{
return "item." + DarkMain.getInstance().PREFIX + EnumOrePart.getFullName(itemStack.getItemDamage());
return "item." + CoreMachine.getInstance().PREFIX + EnumOrePart.getFullName(itemStack.getItemDamage());
}
else
{
@ -62,7 +62,7 @@ public class ItemOreDirv extends ItemBasic implements IExtraItemInfo
{
if (mat.shouldCreateItem(part))
{
mat.itemIcons[part.ordinal()] = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + mat.simpleName + part.simpleName);
mat.itemIcons[part.ordinal()] = iconRegister.registerIcon(CoreMachine.getInstance().PREFIX + mat.simpleName + part.simpleName);
}
}
}

6
src/dark/core/basics/ItemParts.java
View file

@ -15,7 +15,7 @@ import com.dark.prefab.ItemBasic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** A meta data item containing parts of various crafting recipes. These parts do not do anything but
* allow new crafting recipes to be created.
@ -25,7 +25,7 @@ public class ItemParts extends ItemBasic implements IExtraItemInfo
{
public ItemParts()
{
super(DarkCore.getNextItemId(), "DMParts", DarkMain.CONFIGURATION);
super(DarkCore.getNextItemId(), "DMParts", CoreMachine.CONFIGURATION);
this.setHasSubtypes(true);
this.setMaxDamage(0);
this.setMaxStackSize(64);
@ -60,7 +60,7 @@ public class ItemParts extends ItemBasic implements IExtraItemInfo
super.registerIcons(iconRegister);
for (Parts part : Parts.values())
{
part.icon = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "part." + part.name);
part.icon = iconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "part." + part.name);
}
}

11
src/dark/core/interfaces/IBlockActivated.java
View file

@ -1,11 +0,0 @@
package dark.core.interfaces;
import net.minecraft.entity.player.EntityPlayer;
/** Used re relay an activation event from a block or entity to a tile or another entity */
public interface IBlockActivated
{
/** Called when activated. Use angle from tile to get side. and getHeldItem to get the item the
* player is using */
public boolean onActivated(EntityPlayer entityPlayer);
}

2
src/dark/core/interfaces/IDamageableTile.java
View file

@ -1,5 +1,7 @@
package dark.core.interfaces;
import com.dark.interfaces.IBlockActivated;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;

2
src/dark/core/interfaces/IMultiBlock.java
View file

@ -1,5 +1,7 @@
package dark.core.interfaces;
import com.dark.interfaces.IBlockActivated;
import net.minecraft.tileentity.TileEntity;
import universalelectricity.core.vector.Vector3;

4
src/dark/core/prefab/entities/ItemVehicleSpawn.java
View file

@ -14,7 +14,7 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import com.dark.DarkCore;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
/** Basic item used to spawn a vehicle
@ -26,7 +26,7 @@ public class ItemVehicleSpawn extends Item
{
super(DarkCore.getNextItemId());
this.setUnlocalizedName("Vehicle");
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
@Override

4
src/dark/core/prefab/invgui/GuiBar.java
View file

@ -13,14 +13,14 @@ import universalelectricity.core.vector.Vector2;
import com.dark.DarkCore;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** When done should be a prefab that can be used to render a power bar on the screen
*
* @author DarkGuardsman */
public class GuiBar extends Gui
{
public static final ResourceLocation TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "bar.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "bar.png");
protected float currentLevel = 0;
protected float maxLevel = 10;

4
src/dark/core/prefab/invgui/GuiButtonImage.java
View file

@ -11,12 +11,12 @@ import com.dark.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
@SideOnly(Side.CLIENT)
public class GuiButtonImage extends GuiButton
{
public static final ResourceLocation TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "gui_button.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "gui_button.png");
private ButtonIcon buttonIcon = ButtonIcon.BLANK;

4
src/dark/core/prefab/invgui/GuiMessageBox.java
View file

@ -9,11 +9,11 @@ import com.dark.DarkCore;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class GuiMessageBox extends GuiBase
{
public static final ResourceLocation TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "gui_message_box.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "gui_message_box.png");
GuiBase returnGuiYes, returnGuiNo;
int id;

14
src/dark/core/prefab/machine/BlockMachine.java
View file

@ -23,12 +23,12 @@ import com.dark.DarkCore;
import com.dark.IExtraInfo.IExtraBlockInfo;
import com.dark.access.AccessUser;
import com.dark.access.ISpecialAccess;
import com.dark.tile.network.INetworkPart;
import com.dark.tilenetwork.INetworkPart;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.interfaces.IBlockActivated;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Basic TileEntity Container class designed to be used by generic machines. It is suggested that
* each mod using this create there own basic block extending this to reduce need to use build data
@ -54,9 +54,9 @@ public abstract class BlockMachine extends BlockTile implements IExtraBlockInfo
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconReg)
{
this.blockIcon = iconReg.registerIcon(DarkMain.getInstance().PREFIX + "machine");
this.iconInput = iconReg.registerIcon(DarkMain.getInstance().PREFIX + "machine_input");
this.iconOutput = iconReg.registerIcon(DarkMain.getInstance().PREFIX + "machine_output");
this.blockIcon = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + "machine");
this.iconInput = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + "machine_input");
this.iconOutput = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + "machine_output");
}
@Override
@ -178,10 +178,6 @@ public abstract class BlockMachine extends BlockTile implements IExtraBlockInfo
{
return true;
}
if (!world.isRemote && guiID != -1)
{
entityPlayer.openGui(DarkMain.getInstance(), guiID, world, x, y, z);
}
return super.onBlockActivated(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ);
}

6
src/dark/core/prefab/machine/BlockMulti.java
View file

@ -23,7 +23,7 @@ import com.dark.IExtraInfo.IExtraBlockInfo;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class BlockMulti extends BlockContainer implements IExtraBlockInfo
{
@ -32,10 +32,10 @@ public class BlockMulti extends BlockContainer implements IExtraBlockInfo
public BlockMulti()
{
super(DarkMain.CONFIGURATION.getBlock("MultiBlock", DarkCore.getNextID()).getInt(), UniversalElectricity.machine);
super(CoreMachine.CONFIGURATION.getBlock("MultiBlock", DarkCore.getNextID()).getInt(), UniversalElectricity.machine);
this.setHardness(0.8F);
this.setUnlocalizedName("multiBlock");
this.setChannel(DarkMain.CHANNEL);
this.setChannel(CoreMachine.CHANNEL);
}
public BlockMulti setChannel(String channel)

4
src/dark/core/prefab/machine/TileEntityEnergyMachine.java
View file

@ -16,10 +16,8 @@ import universalelectricity.core.grid.IElectricityNetwork;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import com.dark.ExternalModHandler;
import com.dark.interfaces.IPowerLess;
/** Basic energy tile that can consume power
*
* Based off both UE universal electrical tile, and electrical tile prefabs
@ -335,7 +333,7 @@ public abstract class TileEntityEnergyMachine extends TileEntityMachine implemen
@Override
public boolean runPowerLess()
{
return !runWithoutPower || ExternalModHandler.runPowerLess();
return !runWithoutPower;
}
@Override

2
src/dark/core/prefab/machine/TileEntityInv.java
View file

@ -18,7 +18,7 @@ import com.dark.access.AccessUser;
import com.dark.access.GroupRegistry;
import com.dark.access.ISpecialAccess;
import com.dark.access.Nodes;
import com.dark.prefab.tile.network.NetworkTileEntities;
import com.dark.tilenetwork.prefab.NetworkTileEntities;
import dark.core.interfaces.IExternalInv;
import dark.core.interfaces.IInvBox;

4
src/dark/core/prefab/machine/TileEntityMachine.java
View file

@ -22,7 +22,7 @@ import cpw.mods.fml.common.network.Player;
import dark.api.IDisableable;
import dark.core.interfaces.IExternalInv;
import dark.core.interfaces.IInvBox;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public abstract class TileEntityMachine extends TileEntityInv implements ISidedInventory, IExternalInv, IDisableable, ISimplePacketReceiver, IRotatable, IExtraTileEntityInfo
{
@ -260,7 +260,7 @@ public abstract class TileEntityMachine extends TileEntityInv implements ISidedI
/** NetworkMod channel name */
public String getChannel()
{
return DarkMain.CHANNEL;
return CoreMachine.CHANNEL;
}
@Override

42
src/dark/core/prefab/machine/TileEntityNBTContainer.java
View file

@ -1,42 +0,0 @@
package dark.core.prefab.machine;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
/** NBT Container blocks to use that don't really need a tileEntity for anything other than to record
* a few values
*
* @author DarkGuardsman */
public class TileEntityNBTContainer extends TileEntity
{
private NBTTagCompound saveData;
public NBTTagCompound getSaveData()
{
if (this.saveData == null)
{
this.saveData = new NBTTagCompound();
}
return saveData;
}
@Override
public void readFromNBT(NBTTagCompound nbt)
{
super.readFromNBT(nbt);
this.saveData = nbt.getCompoundTag("saveData");
}
@Override
public void writeToNBT(NBTTagCompound nbt)
{
super.writeToNBT(nbt);
nbt.setCompoundTag("saveData", this.getSaveData());
}
@Override
public boolean canUpdate()
{
return false;
}
}

8
src/dark/core/prefab/sentry/BlockSentryGun.java
View file

@ -8,10 +8,10 @@ import net.minecraft.tileentity.TileEntity;
import com.builtbroken.common.Pair;
import com.dark.CoreRegistry;
import com.dark.prefab.BlockMachine;
import com.dark.prefab.ItemBlockHolder;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Actual block that is the sentry gun. Mainly a place holder as the sentry guns need something to
* exist threw that is not an entity. Renders need to still be handled by the respective mod.
@ -27,7 +27,7 @@ public class BlockSentryGun extends BlockMachine
public BlockSentryGun(int v)
{
super(DarkMain.CONFIGURATION, "DMSentryGun" + v, Material.iron);
super(CoreMachine.CONFIGURATION, "DMSentryGun" + v, Material.iron);
this.setResistance(100);
this.setHardness(100);
}
@ -97,7 +97,7 @@ public class BlockSentryGun extends BlockMachine
if (block != null)
{
CoreRegistry.registredBlocks.put(block, "DMSentryGun" + b);
CoreRegistry.proxy.registerBlock(block, ItemBlockHolder.class, "DMSentryGun" + b, DarkMain.MOD_ID);
CoreRegistry.proxy.registerBlock(block, ItemBlockHolder.class, "DMSentryGun" + b, CoreMachine.MOD_ID);
CoreRegistry.finishCreation(block);
sentryBlockIds[b] = block.blockID;
}

7
src/dark/core/prefab/sentry/BlockSentryPlatform.java
View file

@ -1,8 +1,9 @@
package dark.core.prefab.sentry;
import com.dark.prefab.BlockMachine;
import net.minecraft.block.material.Material;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Base platform for all sentry and turret's created to use for power, logic, and inventory
* connections to the world.
@ -13,7 +14,7 @@ public class BlockSentryPlatform extends BlockMachine
public BlockSentryPlatform()
{
super(DarkMain.CONFIGURATION, "DMSentryPlatform", Material.iron);
super(CoreMachine.CONFIGURATION, "DMSentryPlatform", Material.iron);
this.setResistance(100);
this.setHardness(100);
}

4
src/dark/core/prefab/sentry/TileEntitySentry.java
View file

@ -21,7 +21,7 @@ import cpw.mods.fml.common.network.Player;
import dark.api.ISentryGun;
import dark.core.prefab.entities.EntityTileDamage;
import dark.core.prefab.machine.TileEntityMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Prefab tileEntity for creating senty guns that can be of type aimed, mounted, or automated.
* Contains most of the code for a sentry gun to operate short of aiming and operating logic. This
@ -295,7 +295,7 @@ public abstract class TileEntitySentry extends TileEntityMachine implements ISen
@Override
public Packet getDescriptionPacket()
{
return PacketHandler.instance().getTilePacket(DarkMain.CHANNEL, this, "Desc", this.isRunning, this.rotation);
return PacketHandler.instance().getTilePacket(CoreMachine.CHANNEL, this, "Desc", this.isRunning, this.rotation);
}
@Override

73
src/dark/machines/DarkMain.java → src/dark/machines/CoreMachine.java
View file

@ -16,9 +16,9 @@ import universalelectricity.prefab.TranslationHelper;
import universalelectricity.prefab.ore.OreGenReplaceStone;
import universalelectricity.prefab.ore.OreGenerator;
import com.dark.DarkCore;
import com.dark.CoreRegistry;
import com.dark.IndustryCreativeTab;
import com.dark.DarkCore;
import com.dark.IndustryTabs;
import com.dark.fluid.EnumGas;
import com.dark.network.PacketDataWatcher;
import com.dark.network.PacketHandler;
@ -58,7 +58,6 @@ import dark.core.prefab.ModPrefab;
import dark.core.prefab.entities.EntityTestCar;
import dark.core.prefab.entities.ItemVehicleSpawn;
import dark.core.prefab.machine.BlockMulti;
import dark.core.prefab.machine.TileEntityNBTContainer;
import dark.machines.deco.BlockBasalt;
import dark.machines.deco.BlockColorGlass;
import dark.machines.deco.BlockColorGlowGlass;
@ -78,9 +77,9 @@ import dark.machines.transmit.BlockWire;
import dark.machines.transmit.ItemBlockWire;
/** @author HangCow, DarkGuardsman */
@Mod(modid = DarkMain.MOD_ID, name = DarkMain.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:BuildCraft|Energy", useMetadata = true)
@NetworkMod(channels = { DarkMain.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class DarkMain extends ModPrefab
@Mod(modid = CoreMachine.MOD_ID, name = CoreMachine.MOD_NAME, version = CoreMachine.VERSION, dependencies = "after:BuildCraft|Energy", useMetadata = true)
@NetworkMod(channels = { CoreMachine.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class CoreMachine extends ModPrefab
{
// @Mod Prerequisites
public static final String MAJOR_VERSION = "@MAJOR@";
@ -98,7 +97,7 @@ public class DarkMain extends ModPrefab
public static final String CHANNEL = DarkCore.CHANNEL;
@Metadata(DarkMain.MOD_ID)
@Metadata(CoreMachine.MOD_ID)
public static ModMetadata meta;
/** Main config file */
@ -110,18 +109,18 @@ public class DarkMain extends ModPrefab
public static BlockMulti blockMulti;
@Instance(MOD_ID)
private static DarkMain instance;
private static CoreMachine instance;
public static CoreRecipeLoader recipeLoader;
public static final String[] dyeColorNames = new String[] { "Black", "Red", "Green", "Brown", "Blue", "Purple", "Cyan", "Silver", "Gray", "Pink", "Lime", "Yellow", "LightBlue", "Magenta", "Orange", "White" };
public static final Color[] dyeColors = new Color[] { Color.black, Color.red, Color.green, new Color(139, 69, 19), Color.BLUE, new Color(75, 0, 130), Color.cyan, new Color(192, 192, 192), Color.gray, Color.pink, new Color(0, 255, 0), Color.yellow, new Color(135, 206, 250), Color.magenta, Color.orange, Color.white };
public static DarkMain getInstance()
public static CoreMachine getInstance()
{
if (instance == null)
{
instance = new DarkMain();
instance = new CoreMachine();
}
return instance;
}
@ -194,11 +193,11 @@ public class DarkMain extends ModPrefab
proxy.postInit();
if (CoreRecipeLoader.itemParts instanceof ItemParts)
{
IndustryCreativeTab.tabMining().itemStack = new ItemStack(CoreRecipeLoader.itemParts.itemID, 1, ItemParts.Parts.MiningIcon.ordinal());
IndustryTabs.tabMining().itemStack = new ItemStack(CoreRecipeLoader.itemParts.itemID, 1, ItemParts.Parts.MiningIcon.ordinal());
}
if (CoreRecipeLoader.itemMetals instanceof ItemOreDirv)
{
IndustryCreativeTab.tabIndustrial().itemStack = EnumMaterial.getStack(EnumMaterial.IRON, EnumOrePart.GEARS, 1);
IndustryTabs.tabIndustrial().itemStack = EnumMaterial.getStack(EnumMaterial.IRON, EnumOrePart.GEARS, 1);
}
MachineRecipeHandler.parseOreNames(CONFIGURATION);
CONFIGURATION.save();
@ -214,42 +213,40 @@ public class DarkMain extends ModPrefab
/* CONFIGS */
CONFIGURATION.load();
GameRegistry.registerTileEntity(TileEntityNBTContainer.class, "DMNBTSaveBlock");
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
{
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);
CoreMachine.zeroAnimation = CONFIGURATION.get("Graphics", "DisableAllAnimation", false, "Disables active animations by any non-active models").getBoolean(false);
CoreMachine.zeroRendering = CONFIGURATION.get("Graphics", "DisableAllRendering", false, "Replaces all model renderers with single block forms").getBoolean(false);
CoreMachine.zeroGraphics = CONFIGURATION.get("Graphics", "DisableAllGraphics", false, "Disables extra effects that models and renders have. Such as particles, and text").getBoolean(false);
}
/* BLOCKS */
Block m = CoreRegistry.createNewBlock("DMBlockMulti", DarkMain.MOD_ID, BlockMulti.class, false);
Block m = CoreRegistry.createNewBlock("DMBlockMulti", CoreMachine.MOD_ID, BlockMulti.class, false);
if (m instanceof BlockMulti)
{
blockMulti = (BlockMulti) m;
}
CoreRecipeLoader.blockSteamGen = CoreRegistry.createNewBlock("DMBlockSteamMachine", DarkMain.MOD_ID, BlockSmallSteamGen.class, ItemBlockHolder.class);
CoreRecipeLoader.blockOre = CoreRegistry.createNewBlock("DMBlockOre", DarkMain.MOD_ID, BlockOre.class, ItemBlockOre.class);
CoreRecipeLoader.blockWire = CoreRegistry.createNewBlock("DMBlockWire", DarkMain.MOD_ID, BlockWire.class, ItemBlockWire.class);
CoreRecipeLoader.blockDebug = CoreRegistry.createNewBlock("DMBlockDebug", DarkMain.MOD_ID, BlockDebug.class, ItemBlockHolder.class);
CoreRecipeLoader.blockStainGlass = CoreRegistry.createNewBlock("DMBlockStainedGlass", DarkMain.MOD_ID, BlockColorGlass.class, ItemBlockColored.class);
CoreRecipeLoader.blockColorSand = CoreRegistry.createNewBlock("DMBlockColorSand", DarkMain.MOD_ID, BlockColorSand.class, ItemBlockColored.class);
CoreRecipeLoader.blockBasalt = CoreRegistry.createNewBlock("DMBlockBasalt", DarkMain.MOD_ID, BlockBasalt.class, ItemBlockColored.class);
CoreRecipeLoader.blockGlowGlass = CoreRegistry.createNewBlock("DMBlockGlowGlass", DarkMain.MOD_ID, BlockColorGlowGlass.class, ItemBlockColored.class);
CoreRecipeLoader.blockSolar = CoreRegistry.createNewBlock("DMBlockSolar", DarkMain.MOD_ID, BlockSolarPanel.class, ItemBlockHolder.class);
CoreRecipeLoader.blockGas = CoreRegistry.createNewBlock("DMBlockGas", DarkMain.MOD_ID, BlockGasOre.class, ItemBlockHolder.class);
CoreRecipeLoader.blockBatBox = CoreRegistry.createNewBlock("DMBlockBatBox", DarkMain.MOD_ID, BlockEnergyStorage.class, ItemBlockEnergyStorage.class);
CoreRecipeLoader.blockSteamGen = CoreRegistry.createNewBlock("DMBlockSteamMachine", CoreMachine.MOD_ID, BlockSmallSteamGen.class, ItemBlockHolder.class);
CoreRecipeLoader.blockOre = CoreRegistry.createNewBlock("DMBlockOre", CoreMachine.MOD_ID, BlockOre.class, ItemBlockOre.class);
CoreRecipeLoader.blockWire = CoreRegistry.createNewBlock("DMBlockWire", CoreMachine.MOD_ID, BlockWire.class, ItemBlockWire.class);
CoreRecipeLoader.blockDebug = CoreRegistry.createNewBlock("DMBlockDebug", CoreMachine.MOD_ID, BlockDebug.class, ItemBlockHolder.class);
CoreRecipeLoader.blockStainGlass = CoreRegistry.createNewBlock("DMBlockStainedGlass", CoreMachine.MOD_ID, BlockColorGlass.class, ItemBlockColored.class);
CoreRecipeLoader.blockColorSand = CoreRegistry.createNewBlock("DMBlockColorSand", CoreMachine.MOD_ID, BlockColorSand.class, ItemBlockColored.class);
CoreRecipeLoader.blockBasalt = CoreRegistry.createNewBlock("DMBlockBasalt", CoreMachine.MOD_ID, BlockBasalt.class, ItemBlockColored.class);
CoreRecipeLoader.blockGlowGlass = CoreRegistry.createNewBlock("DMBlockGlowGlass", CoreMachine.MOD_ID, BlockColorGlowGlass.class, ItemBlockColored.class);
CoreRecipeLoader.blockSolar = CoreRegistry.createNewBlock("DMBlockSolar", CoreMachine.MOD_ID, BlockSolarPanel.class, ItemBlockHolder.class);
CoreRecipeLoader.blockGas = CoreRegistry.createNewBlock("DMBlockGas", CoreMachine.MOD_ID, BlockGasOre.class, ItemBlockHolder.class);
CoreRecipeLoader.blockBatBox = CoreRegistry.createNewBlock("DMBlockBatBox", CoreMachine.MOD_ID, BlockEnergyStorage.class, ItemBlockEnergyStorage.class);
/* ITEMS */
CoreRecipeLoader.itemTool = CoreRegistry.createNewItem("DMReadoutTools", DarkMain.MOD_ID, ItemReadoutTools.class, true);
CoreRecipeLoader.itemMetals = CoreRegistry.createNewItem("DMOreDirvParts", DarkMain.MOD_ID, ItemOreDirv.class, true);
CoreRecipeLoader.battery = CoreRegistry.createNewItem("DMItemBattery", DarkMain.MOD_ID, ItemBattery.class, true);
CoreRecipeLoader.wrench = CoreRegistry.createNewItem("DMWrench", DarkMain.MOD_ID, ItemWrench.class, true);
CoreRecipeLoader.itemParts = CoreRegistry.createNewItem("DMCraftingParts", DarkMain.MOD_ID, ItemParts.class, true);
CoreRecipeLoader.itemGlowingSand = CoreRegistry.createNewItem("DMItemGlowingSand", DarkMain.MOD_ID, ItemColoredDust.class, true);
CoreRecipeLoader.itemDiggingTool = CoreRegistry.createNewItem("ItemDiggingTools", DarkMain.MOD_ID, ItemCommonTool.class, true);
CoreRecipeLoader.itemVehicleTest = CoreRegistry.createNewItem("ItemVehicleTest", DarkMain.MOD_ID, ItemVehicleSpawn.class, true);
CoreRecipeLoader.itemFluidCan = CoreRegistry.createNewItem("ItemFluidCan", DarkMain.MOD_ID, ItemFluidCan.class, true);
CoreRecipeLoader.itemTool = CoreRegistry.createNewItem("DMReadoutTools", CoreMachine.MOD_ID, ItemReadoutTools.class, true);
CoreRecipeLoader.itemMetals = CoreRegistry.createNewItem("DMOreDirvParts", CoreMachine.MOD_ID, ItemOreDirv.class, true);
CoreRecipeLoader.battery = CoreRegistry.createNewItem("DMItemBattery", CoreMachine.MOD_ID, ItemBattery.class, true);
CoreRecipeLoader.wrench = CoreRegistry.createNewItem("DMWrench", CoreMachine.MOD_ID, ItemWrench.class, true);
CoreRecipeLoader.itemParts = CoreRegistry.createNewItem("DMCraftingParts", CoreMachine.MOD_ID, ItemParts.class, true);
CoreRecipeLoader.itemGlowingSand = CoreRegistry.createNewItem("DMItemGlowingSand", CoreMachine.MOD_ID, ItemColoredDust.class, true);
CoreRecipeLoader.itemDiggingTool = CoreRegistry.createNewItem("ItemDiggingTools", CoreMachine.MOD_ID, ItemCommonTool.class, true);
CoreRecipeLoader.itemVehicleTest = CoreRegistry.createNewItem("ItemVehicleTest", CoreMachine.MOD_ID, ItemVehicleSpawn.class, true);
CoreRecipeLoader.itemFluidCan = CoreRegistry.createNewItem("ItemFluidCan", CoreMachine.MOD_ID, ItemFluidCan.class, true);
//Config saves in post init to allow for other feature to access it
}

2
src/dark/machines/PacketManagerEffects.java
View file

@ -44,7 +44,7 @@ public class PacketManagerEffects implements IPacketManager
if (effectName.equalsIgnoreCase("laser"))
{
System.out.println("Received laser packet");
DarkMain.proxy.renderBeam(world, PacketHandler.readVector3(data), PacketHandler.readVector3(data), new Color(data.readInt(), data.readInt(), data.readInt()), data.readInt());
CoreMachine.proxy.renderBeam(world, PacketHandler.readVector3(data), PacketHandler.readVector3(data), new Color(data.readInt(), data.readInt(), data.readInt()), data.readInt());
}
}
}

4
src/dark/machines/client/gui/GuiBatteryBox.java
View file

@ -14,14 +14,14 @@ import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.machines.ContainerBatteryBox;
import dark.machines.machines.TileEntityBatteryBox;
@SideOnly(Side.CLIENT)
public class GuiBatteryBox extends GuiContainer
{
private static final ResourceLocation TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "battery_box.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "battery_box.png");
private TileEntityBatteryBox tileEntity;

4
src/dark/machines/client/gui/GuiMachineBase.java
View file

@ -15,7 +15,7 @@ import dark.core.prefab.invgui.GuiBase;
import dark.core.prefab.invgui.GuiButtonImage;
import dark.core.prefab.invgui.GuiButtonImage.ButtonIcon;
import dark.core.prefab.machine.TileEntityMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** To be used with all machine that have a gui to allow generic settings and feature all all devices
*
@ -23,7 +23,7 @@ import dark.machines.DarkMain;
public class GuiMachineBase extends GuiBase
{
public static final ResourceLocation TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "gui_grey.png");
public static final ResourceLocation TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.GUI_DIRECTORY + "gui_grey.png");
protected static final int MAX_BUTTON_ID = 3;
protected TileEntityMachine tileEntity;

4
src/dark/machines/client/renders/BlockRenderingHandler.java
View file

@ -15,7 +15,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.CoreRecipeLoader;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.client.models.ModelMachine;
import dark.machines.client.models.ModelSolarPanel;
@ -32,7 +32,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glPushMatrix();
if (CoreRecipeLoader.blockSolar != null && block.blockID == CoreRecipeLoader.blockSolar.blockID)
{
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "solarPanel.png"));
FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "solarPanel.png"));
GL11.glTranslatef(0.0F, 1.1F, 0.0F);
GL11.glRotatef(180f, 0f, 0f, 1f);
solarPanelModel.render(0.0625F);

4
src/dark/machines/client/renders/ItemRenderFluidCan.java
View file

@ -14,7 +14,7 @@ import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.CoreRecipeLoader;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.client.models.ModelSmallFluidCan;
import dark.machines.items.ItemFluidCan;
@ -23,7 +23,7 @@ public class ItemRenderFluidCan implements IItemRenderer
{
public static final ModelSmallFluidCan CAN_MODEL = new ModelSmallFluidCan();
public static final ResourceLocation CAN_TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "FluidCanA.png");
public static final ResourceLocation CAN_TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "FluidCanA.png");
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)

4
src/dark/machines/client/renders/RenderBlockSolarPanel.java
View file

@ -9,13 +9,13 @@ import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.client.models.ModelSolarPanel;
@SideOnly(Side.CLIENT)
public class RenderBlockSolarPanel extends RenderTileMachine
{
private static final ResourceLocation solarPanelTexture = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "SolarPanel.png");
private static final ResourceLocation solarPanelTexture = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "SolarPanel.png");
public static final ModelSolarPanel model = new ModelSolarPanel();

4
src/dark/machines/client/renders/RenderBlockWire.java
View file

@ -15,13 +15,13 @@ import universalelectricity.core.vector.VectorHelper;
import buildcraft.api.power.IPowerReceptor;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.client.models.ModelCopperWire;
@SideOnly(Side.CLIENT)
public class RenderBlockWire extends RenderTileMachine
{
private static final ResourceLocation copperWireTexture = new ResourceLocation(DarkMain.getInstance().DOMAIN, "textures/models/copperWire.png");
private static final ResourceLocation copperWireTexture = new ResourceLocation(CoreMachine.getInstance().DOMAIN, "textures/models/copperWire.png");
public static final ModelCopperWire model = new ModelCopperWire();

6
src/dark/machines/client/renders/RenderSteamGen.java
View file

@ -11,7 +11,7 @@ import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.machine.TileEntityMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.client.models.ModelMachine;
import dark.machines.client.models.ModelSteamGen;
import dark.machines.client.models.ModelSteamTurbine;
@ -22,8 +22,8 @@ public class RenderSteamGen extends RenderTileMachine
public static final ModelSteamTurbine TURBINE_MODEL = new ModelSteamTurbine();
public static final ModelSteamGen STEAM_GEN_MODEL = new ModelSteamGen();
public static final ResourceLocation TURBINE_TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "SmallSteamFan.png");
public static final ResourceLocation STEAM_GEN_TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "SteamGenerator.png");
public static final ResourceLocation TURBINE_TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "SmallSteamFan.png");
public static final ResourceLocation STEAM_GEN_TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "SteamGenerator.png");
private static float rot1 = 0;
@Override

4
src/dark/machines/client/renders/RenderTestCar.java
View file

@ -13,13 +13,13 @@ import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.entities.EntityAdvanced;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.client.models.ModelTestCar;
@SideOnly(Side.CLIENT)
public class RenderTestCar extends Render
{
private static final ResourceLocation TEXTURE = new ResourceLocation(DarkMain.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "TestCar.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(CoreMachine.getInstance().DOMAIN, DarkCore.MODEL_DIRECTORY + "TestCar.png");
/** instance of ModelBoat for rendering */
protected ModelBase modelBoat;

6
src/dark/machines/deco/BlockBasalt.java
View file

@ -12,7 +12,7 @@ import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class BlockBasalt extends Block
{
@ -38,7 +38,7 @@ public class BlockBasalt extends Block
public BlockBasalt()
{
super(DarkMain.CONFIGURATION.getBlock("basalt", DarkCore.getNextID()).getInt(), Material.rock);
super(CoreMachine.CONFIGURATION.getBlock("basalt", DarkCore.getNextID()).getInt(), Material.rock);
this.setCreativeTab(CreativeTabs.tabDecorations);
this.setHardness(2f);
this.setResistance(2f);
@ -86,7 +86,7 @@ public class BlockBasalt extends Block
for (int i = 0; i < BlockBasalt.blockNames.length; ++i)
{
this.icons[i] = iconReg.registerIcon(DarkMain.getInstance().PREFIX + BlockBasalt.blockNames[i]);
this.icons[i] = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + BlockBasalt.blockNames[i]);
}
}

4
src/dark/machines/deco/BlockColorGlass.java
View file

@ -9,14 +9,14 @@ import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class BlockColorGlass extends BlockColored
{
public BlockColorGlass(String name)
{
super(name, DarkMain.CONFIGURATION.getBlock(name, DarkCore.getNextID()).getInt(), Material.glass);
super(name, CoreMachine.CONFIGURATION.getBlock(name, DarkCore.getNextID()).getInt(), Material.glass);
this.setCreativeTab(CreativeTabs.tabDecorations);
this.setHardness(.5f);
this.setResistance(.5f);

4
src/dark/machines/deco/BlockColorSand.java
View file

@ -9,14 +9,14 @@ import net.minecraft.world.World;
import com.dark.DarkCore;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
//TODO fix instant falling sand
public class BlockColorSand extends BlockColored
{
public BlockColorSand()
{
super("colorSand", DarkMain.CONFIGURATION.getBlock("colorSand", DarkCore.getNextID()).getInt(), Material.sand);
super("colorSand", CoreMachine.CONFIGURATION.getBlock("colorSand", DarkCore.getNextID()).getInt(), Material.sand);
this.setCreativeTab(CreativeTabs.tabDecorations);
this.setHardness(1f);
this.setResistance(.5f);

8
src/dark/machines/deco/BlockColored.java
View file

@ -11,7 +11,7 @@ import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Prefab class to make any block have 16 separate color instances similar to wool block
*
@ -63,7 +63,7 @@ public class BlockColored extends Block
{
if (colorized)
{
this.blockIcon = iconReg.registerIcon(DarkMain.getInstance().PREFIX + this.getUnlocalizedName().replace("tile.", ""));
this.blockIcon = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + this.getUnlocalizedName().replace("tile.", ""));
}
else
{
@ -71,7 +71,7 @@ public class BlockColored extends Block
for (int i = 0; i < this.icons.length; ++i)
{
this.icons[i] = iconReg.registerIcon(DarkMain.getInstance().PREFIX + DarkMain.dyeColorNames[~i & 15] + this.getUnlocalizedName().replace("tile.", ""));
this.icons[i] = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + CoreMachine.dyeColorNames[~i & 15] + this.getUnlocalizedName().replace("tile.", ""));
}
}
}
@ -89,7 +89,7 @@ public class BlockColored extends Block
{
if (this.colorized)
{
return DarkMain.dyeColors[meta & 15].getRGB();
return CoreMachine.dyeColors[meta & 15].getRGB();
}
return super.getRenderColor(meta);
}

4
src/dark/machines/deco/ItemBlockColored.java
View file

@ -3,7 +3,7 @@ package dark.machines.deco;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class ItemBlockColored extends ItemBlock
{
@ -23,7 +23,7 @@ public class ItemBlockColored extends ItemBlock
@Override
public String getUnlocalizedName(ItemStack par1ItemStack)
{
return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + DarkMain.dyeColorNames[par1ItemStack.getItemDamage()];
return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + CoreMachine.dyeColorNames[par1ItemStack.getItemDamage()];
}
@Override

10
src/dark/machines/generators/BlockSmallSteamGen.java
View file

@ -16,12 +16,12 @@ import net.minecraftforge.common.Configuration;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
import com.dark.prefab.BlockMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.client.renders.BlockRenderingHandler;
import dark.machines.client.renders.RenderSteamGen;
@ -36,9 +36,9 @@ public class BlockSmallSteamGen extends BlockMachine
public BlockSmallSteamGen()
{
super(DarkMain.CONFIGURATION, "StarterSteamGen", UniversalElectricity.machine);
super(CoreMachine.CONFIGURATION, "StarterSteamGen", UniversalElectricity.machine);
this.setStepSound(soundMetalFootstep);
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
@Override

10
src/dark/machines/generators/BlockSolarPanel.java
View file

@ -12,12 +12,12 @@ import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
import com.dark.prefab.BlockMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.client.renders.BlockRenderingHandler;
import dark.machines.client.renders.RenderBlockSolarPanel;
@ -30,9 +30,9 @@ public class BlockSolarPanel extends BlockMachine
public BlockSolarPanel()
{
super(DarkMain.CONFIGURATION, "BlockSolarPanel", UniversalElectricity.machine);
super(CoreMachine.CONFIGURATION, "BlockSolarPanel", UniversalElectricity.machine);
this.setBlockBounds(0, 0, 0, 1f, .6f, 1f);
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
@Override

10
src/dark/machines/items/ItemBattery.java
View file

@ -7,12 +7,12 @@ import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.core.item.ItemElectric;
import com.dark.DarkCore;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
import com.dark.IExtraInfo.IExtraItemInfo;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Simple battery to store energy
*
@ -21,9 +21,9 @@ public class ItemBattery extends ItemElectric implements IExtraItemInfo
{
public ItemBattery()
{
super(DarkMain.CONFIGURATION.getItem("Battery", DarkCore.getNextItemId()).getInt());
this.setUnlocalizedName(DarkMain.getInstance().PREFIX + "Battery");
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
super(CoreMachine.CONFIGURATION.getItem("Battery", DarkCore.getNextItemId()).getInt());
this.setUnlocalizedName(CoreMachine.getInstance().PREFIX + "Battery");
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
@SideOnly(Side.CLIENT)

12
src/dark/machines/items/ItemColoredDust.java
View file

@ -12,7 +12,7 @@ import com.dark.prefab.ItemBasic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class ItemColoredDust extends ItemBasic
{
@ -21,7 +21,7 @@ public class ItemColoredDust extends ItemBasic
public ItemColoredDust()
{
super(DarkCore.getNextItemId(), "GlowRefinedSand", DarkMain.CONFIGURATION);
super(DarkCore.getNextItemId(), "GlowRefinedSand", CoreMachine.CONFIGURATION);
this.setMaxDamage(0);
this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabMaterials);
@ -31,7 +31,7 @@ public class ItemColoredDust extends ItemBasic
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2)
{
return DarkMain.dyeColors[par1ItemStack.getItemDamage() % 16].getRGB();
return CoreMachine.dyeColors[par1ItemStack.getItemDamage() % 16].getRGB();
}
@Override
@ -45,7 +45,7 @@ public class ItemColoredDust extends ItemBasic
@Override
public void registerIcons(IconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon(DarkMain.getInstance().PREFIX + "dust");
this.itemIcon = par1IconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "dust");
this.theIcon = par1IconRegister.registerIcon("glowingPowder_overlay");
}
@ -58,13 +58,13 @@ public class ItemColoredDust extends ItemBasic
@Override
public final String getUnlocalizedName(ItemStack par1ItemStack)
{
return this.getUnlocalizedName() + "." + DarkMain.dyeColorNames[par1ItemStack.getItemDamage()];
return this.getUnlocalizedName() + "." + CoreMachine.dyeColorNames[par1ItemStack.getItemDamage()];
}
@Override
public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
for (int i = 0; i < DarkMain.dyeColorNames.length; i++)
for (int i = 0; i < CoreMachine.dyeColorNames.length; i++)
{
par3List.add(new ItemStack(par1, 1, i));
}

8
src/dark/machines/items/ItemFluidCan.java
View file

@ -14,11 +14,11 @@ import net.minecraftforge.fluids.ItemFluidContainer;
import universalelectricity.core.item.ElectricItemHelper;
import com.dark.DarkCore;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Small fluid can that is designed to store up to one bucket of fluid. Doesn't work like a bucket
* as it is sealed with a pressure cap. This can is designed to work with tools or machines only.
@ -33,9 +33,9 @@ public class ItemFluidCan extends ItemFluidContainer
public ItemFluidCan()
{
super(DarkMain.CONFIGURATION.getItem("FluidCan", DarkCore.getNextItemId()).getInt());
super(CoreMachine.CONFIGURATION.getItem("FluidCan", DarkCore.getNextItemId()).getInt());
this.setUnlocalizedName("FluidCan");
this.setCreativeTab(IndustryCreativeTab.tabHydraulic());
this.setCreativeTab(IndustryTabs.tabHydraulic());
this.setMaxStackSize(1);
this.setMaxDamage(100);
this.setNoRepair();

8
src/dark/machines/items/ItemReadoutTools.java
View file

@ -28,7 +28,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.IToolReadOut;
import dark.api.IToolReadOut.EnumTools;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class ItemReadoutTools extends ItemBasic
{
@ -36,7 +36,7 @@ public class ItemReadoutTools extends ItemBasic
public ItemReadoutTools()
{
super(DarkCore.getNextItemId(), "DMTools", DarkMain.CONFIGURATION);
super(DarkCore.getNextItemId(), "DMTools", CoreMachine.CONFIGURATION);
this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabTools);
this.setMaxStackSize(1);
@ -47,8 +47,8 @@ public class ItemReadoutTools extends ItemBasic
@Override
public void registerIcons(IconRegister iconRegister)
{
this.pipeGuage = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "readout.PipeGauge");
this.multiMeter = iconRegister.registerIcon(DarkMain.getInstance().PREFIX + "readout.multi-Meter");
this.pipeGuage = iconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "readout.PipeGauge");
this.multiMeter = iconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "readout.multi-Meter");
}
@SideOnly(Side.CLIENT)

6
src/dark/machines/items/ItemWrench.java
View file

@ -14,7 +14,7 @@ import com.dark.DarkCore;
import com.dark.IExtraInfo.IExtraItemInfo;
import com.dark.prefab.ItemBasic;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo
{
@ -22,10 +22,10 @@ public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo
public ItemWrench()
{
super(DarkCore.getNextItemId(), "wrench", DarkMain.CONFIGURATION);
super(DarkCore.getNextItemId(), "wrench", CoreMachine.CONFIGURATION);
this.setMaxStackSize(1);
this.setCreativeTab(CreativeTabs.tabTools);
this.setTextureName(DarkMain.getInstance().PREFIX + "wrench");
this.setTextureName(CoreMachine.getInstance().PREFIX + "wrench");
}

12
src/dark/machines/machines/BlockDebug.java
View file

@ -14,12 +14,12 @@ import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import com.builtbroken.common.Pair;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
import com.dark.prefab.BlockMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class BlockDebug extends BlockMachine
{
@ -27,8 +27,8 @@ public class BlockDebug extends BlockMachine
public BlockDebug()
{
super(DarkMain.CONFIGURATION, "DebugBlock", Material.clay);
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
super(CoreMachine.CONFIGURATION, "DebugBlock", Material.clay);
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
@Override
@ -40,7 +40,7 @@ public class BlockDebug extends BlockMachine
{
if (block.enabled)
{
block.icon = iconReg.registerIcon(DarkMain.getInstance().PREFIX + block.getTextureName());
block.icon = iconReg.registerIcon(CoreMachine.getInstance().PREFIX + block.getTextureName());
}
}
}

12
src/dark/machines/machines/BlockEnergyStorage.java
View file

@ -17,12 +17,12 @@ import universalelectricity.core.block.IConductor;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
import com.dark.helpers.ItemWorldHelper;
import com.dark.prefab.BlockMachine;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.CommonProxy;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
/** Block for energy storage devices
*
@ -31,8 +31,8 @@ public class BlockEnergyStorage extends BlockMachine
{
public BlockEnergyStorage()
{
super(DarkMain.CONFIGURATION, "DMEnergyStorage", UniversalElectricity.machine);
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
super(CoreMachine.CONFIGURATION, "DMEnergyStorage", UniversalElectricity.machine);
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
@Override
@ -55,7 +55,7 @@ public class BlockEnergyStorage extends BlockMachine
if (!par1World.isRemote)
{
par5EntityPlayer.openGui(DarkMain.getInstance(), CommonProxy.GUI_BATTERY_BOX, par1World, x, y, z);
par5EntityPlayer.openGui(CoreMachine.getInstance(), CommonProxy.GUI_BATTERY_BOX, par1World, x, y, z);
}
return true;

10
src/dark/machines/machines/BlockTransformer.java
View file

@ -1,18 +1,18 @@
package dark.machines.machines;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
import com.dark.prefab.BlockMachine;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;
import universalelectricity.core.UniversalElectricity;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
public class BlockTransformer extends BlockMachine
{
public BlockTransformer(Configuration config, String blockName, Material material)
{
super(DarkMain.CONFIGURATION, "Transformer", UniversalElectricity.machine);
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
super(CoreMachine.CONFIGURATION, "Transformer", UniversalElectricity.machine);
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
}

2
src/dark/machines/machines/TileEntityInfFluid.java
View file

@ -17,8 +17,8 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.lang.TextHelper.TextColor;
import com.dark.fluid.FluidHelper;
import com.dark.interfaces.IBlockActivated;
import dark.core.interfaces.IBlockActivated;
public class TileEntityInfFluid extends TileEntity implements IFluidHandler, IBlockActivated
{

12
src/dark/machines/transmit/BlockWire.java
View file

@ -21,12 +21,12 @@ import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.tile.TileEntityConductor;
import com.builtbroken.common.Pair;
import com.dark.IndustryCreativeTab;
import com.dark.IndustryTabs;
import com.dark.prefab.BlockMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.DarkMain;
import dark.machines.CoreMachine;
import dark.machines.client.renders.RenderBlockWire;
public class BlockWire extends BlockMachine
@ -42,19 +42,19 @@ public class BlockWire extends BlockMachine
public BlockWire()
{
super(DarkMain.CONFIGURATION, "DMWire", Material.cloth);
super(CoreMachine.CONFIGURATION, "DMWire", Material.cloth);
this.setStepSound(soundClothFootstep);
this.setResistance(0.2F);
this.setHardness(0.1f);
this.setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f);
Block.setBurnProperties(this.blockID, 30, 60);
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
this.setCreativeTab(IndustryTabs.tabIndustrial());
}
@Override
public void registerIcons(IconRegister par1IconRegister)
{
this.wireIcon = par1IconRegister.registerIcon(DarkMain.getInstance().PREFIX + "CopperWire");
this.wireIcon = par1IconRegister.registerIcon(CoreMachine.getInstance().PREFIX + "CopperWire");
}
@Override