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

Clean up and import changes

Browse source
This commit is contained in:
DarkGuardsman 2013-12-18 16:01:18 -05:00
parent 8a8360ba55
commit 7d049b98a6
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dark/farmtech/FarmTech.java
View file

@ -10,7 +10,8 @@ import net.minecraftforge.common.Configuration;
import universalelectricity.prefab.TranslationHelper; import universalelectricity.prefab.TranslationHelper;
import com.dark.DarkCore; import com.dark.DarkCore;
import com.dark.ModObjectRegistry; import com.dark.CoreRegistry;
import com.dark.prefab.ItemBlockHolder;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
@ -28,7 +29,6 @@ import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import dark.api.farm.CropAutomationHandler; import dark.api.farm.CropAutomationHandler;
import dark.api.farm.DecayMatterList; import dark.api.farm.DecayMatterList;
import dark.core.prefab.ItemBlockHolder;
import dark.core.prefab.ModPrefab; import dark.core.prefab.ModPrefab;
import dark.farmtech.blocks.BlockFarmSoil; import dark.farmtech.blocks.BlockFarmSoil;
import dark.farmtech.entities.EntityFarmEgg; import dark.farmtech.entities.EntityFarmEgg;
@ -112,7 +112,7 @@ public class FarmTech extends ModPrefab
{ {
CONFIGURATION.load(); CONFIGURATION.load();
blockFarmSoil = ModObjectRegistry.createNewBlock("FTBlockFarmSoil", FarmTech.MOD_ID, BlockFarmSoil.class, ItemBlockHolder.class); blockFarmSoil = CoreRegistry.createNewBlock("FTBlockFarmSoil", FarmTech.MOD_ID, BlockFarmSoil.class, ItemBlockHolder.class);
//String compostList = CONFIGURATION.get("DecayMatter", "List", "5::8000:1", "Items or blocks beyond the built in ones that can be turned into compost. Entries go BlockID:Meta:Time:Amount").getString(); //String compostList = CONFIGURATION.get("DecayMatter", "List", "5::8000:1", "Items or blocks beyond the built in ones that can be turned into compost. Entries go BlockID:Meta:Time:Amount").getString();
//DecayMatterList.parseConfigString(compostList); //DecayMatterList.parseConfigString(compostList);

2
src/dark/farmtech/item/ItemFarmFood.java
View file

@ -18,10 +18,10 @@ import universalelectricity.core.vector.Vector3;
import com.dark.DarkCore; import com.dark.DarkCore;
import com.dark.IExtraInfo.IExtraItemInfo; import com.dark.IExtraInfo.IExtraItemInfo;
import com.dark.helpers.ItemWorldHelper;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import dark.core.helpers.ItemWorldHelper;
import dark.farmtech.FarmTech; import dark.farmtech.FarmTech;
/** Item for storing all kinds of food based items including meats, fruits, pies, cakes, breads, etc /** Item for storing all kinds of food based items including meats, fruits, pies, cakes, breads, etc

7
src/dark/farmtech/machines/TileEntityMechCompBox.java
View file

@ -3,11 +3,12 @@ package dark.farmtech.machines;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.dark.prefab.tile.network.NetworkSharedPower;
import com.dark.tile.network.INetworkEnergyPart;
import com.dark.tile.network.ITileNetwork;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import dark.api.tilenetwork.INetworkEnergyPart;
import dark.api.tilenetwork.ITileNetwork;
import dark.core.prefab.tilenetwork.NetworkSharedPower;
/** Advanced version of the compBox that can link to other boxes and process matter at a higher rate. /** Advanced version of the compBox that can link to other boxes and process matter at a higher rate.
* Cost some minor power and will have some mechanical animation of flipping dirt & items * Cost some minor power and will have some mechanical animation of flipping dirt & items

3
src/dark/farmtech/machines/farmer/EntityFarmDrone.java
View file

@ -1,12 +1,13 @@
package dark.farmtech.machines.farmer; package dark.farmtech.machines.farmer;
import com.dark.helpers.ItemWorldHelper;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World; import net.minecraft.world.World;
import universalelectricity.core.block.IElectricalStorage; import universalelectricity.core.block.IElectricalStorage;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
import dark.core.helpers.ItemWorldHelper;
public class EntityFarmDrone extends EntityLiving implements IElectricalStorage public class EntityFarmDrone extends EntityLiving implements IElectricalStorage
{ {