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

Clean up and import changes

Browse source
This commit is contained in:
DarkGuardsman 2013-12-18 14:54:58 -05:00
parent 378a8bd89e
commit 8a8360ba55
7 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,13 +3,15 @@ package dark.farmtech;
import java.io.File;
import java.util.Arrays;
import com.dark.ModObjectRegistry;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.item.Item;
import net.minecraftforge.common.Configuration;
import universalelectricity.prefab.TranslationHelper;
import com.dark.DarkCore;
import com.dark.ModObjectRegistry;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
@ -144,7 +146,7 @@ public class FarmTech extends ModPrefab
meta.description = "Farming addon for Darks Core Machine";
meta.url = "http://www.universalelectricity.com/coremachine";
meta.logoFile = TEXTURE_DIRECTORY + "GP_Banner.png";
meta.logoFile = DarkCore.TEXTURE_DIRECTORY + "GP_Banner.png";
meta.version = DarkMain.VERSION;
meta.authorList = Arrays.asList(new String[] { "DarkGuardsman", "LiQuiD" });
meta.credits = "Please see the website.";

6
src/dark/farmtech/blocks/BlockCrops.java
View file

@ -5,7 +5,9 @@ import net.minecraft.block.material.Material;
import net.minecraft.world.World;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.common.IPlantable;
import dark.core.prefab.ModPrefab;
import com.dark.DarkCore;
import dark.farmtech.FarmTech;
public class BlockCrops extends Block implements IPlantable
@ -13,7 +15,7 @@ public class BlockCrops extends Block implements IPlantable
public BlockCrops()
{
super(FarmTech.CONFIGURATION.getBlock("Crop", ModPrefab.getNextID()).getInt(), Material.vine);
super(FarmTech.CONFIGURATION.getBlock("Crop", DarkCore.getNextID()).getInt(), Material.vine);
this.setUnlocalizedName("FarmCrops");
}

14
src/dark/farmtech/blocks/BlockFarmSoil.java
View file

@ -11,21 +11,23 @@ import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.IPlantable;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.ModPrefab;
import dark.farmtech.FarmTech;
/** Generic block set containing farm blocks: mulch, fertilizer, fertile dirt, mud
*
*
* mulch/fertilizer -> fertileDirt -> mud -> dirt
*
*
* @mulch is a decor version of fertilizer made from wood. decays very slowly when actually used for
* crops. Design is to be used with small plant for decor
*
*
* @fertilizer enriches the soil and is used to grow crops faster fertilizer can be created from
* anything using several means
*
*
* @author darkguardsman */
public class BlockFarmSoil extends Block
{
@ -33,7 +35,7 @@ public class BlockFarmSoil extends Block
public BlockFarmSoil()
{
super(FarmTech.CONFIGURATION.getBlock("FarmSoil", ModPrefab.getNextID()).getInt(), Material.clay);
super(FarmTech.CONFIGURATION.getBlock("FarmSoil", DarkCore.getNextID()).getInt(), Material.clay);
this.setUnlocalizedName("FarmBlock");
this.setCreativeTab(CreativeTabs.tabBlock);
}

5
src/dark/farmtech/client/renders/RenderTurkey.java
View file

@ -6,6 +6,9 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import com.dark.DarkCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.farmtech.FarmTech;
@ -15,7 +18,7 @@ import dark.farmtech.entities.EntityTurkey;
@SideOnly(Side.CLIENT)
public class RenderTurkey extends RenderLiving
{
private static final ResourceLocation TEXTURE = new ResourceLocation(FarmTech.instance.DOMAIN, FarmTech.MODEL_DIRECTORY + "Turkey.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(FarmTech.instance.DOMAIN, DarkCore.MODEL_DIRECTORY + "Turkey.png");
public RenderTurkey()
{

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

@ -2,8 +2,6 @@ package dark.farmtech.item;
import java.util.List;
import com.dark.IExtraInfo.IExtraItemInfo;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@ -17,15 +15,18 @@ import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.core.vector.Vector3;
import com.dark.DarkCore;
import com.dark.IExtraInfo.IExtraItemInfo;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.helpers.ItemWorldHelper;
import dark.core.prefab.ModPrefab;
import dark.farmtech.FarmTech;
/** Item for storing all kinds of food based items including meats, fruits, pies, cakes, breads, etc
* we have 1000s of meta to work with :)
*
*
* @author DarkGuardsman */
public class ItemFarmFood extends Item implements IExtraItemInfo
{
@ -34,7 +35,7 @@ public class ItemFarmFood extends Item implements IExtraItemInfo
public ItemFarmFood(int par1)
{
super(FarmTech.CONFIGURATION.getItem("Food", ModPrefab.getNextID()).getInt());
super(FarmTech.CONFIGURATION.getItem("Food", DarkCore.getNextID()).getInt());
this.setHasSubtypes(true);
this.setCreativeTab(CreativeTabs.tabFood);
this.setUnlocalizedName("FarmFood");
@ -168,7 +169,7 @@ public class ItemFarmFood extends Item implements IExtraItemInfo
}
/** enum that stores data for each meta value that represents a food object for the item
*
*
* @Source http://urbanext.illinois.edu/herbs/list.cfm
* @author DarkGuardsman */
public static enum FarmFood
@ -249,7 +250,7 @@ public class ItemFarmFood extends Item implements IExtraItemInfo
}
/** IDs what the item is and determines how its used
*
*
* @author DarkGuardsman */
public static enum FoodType
{

4
src/dark/farmtech/machines/BlockBasicFarmMachine.java
View file

@ -26,9 +26,9 @@ public class BlockBasicFarmMachine extends BlockFT
}
public BlockBasicFarmMachine(String name, int blockID, Material material)
public BlockBasicFarmMachine(String name, Material material)
{
super(BlockBasicFarmMachine.class, name, material);
super(name, material);
}
@SideOnly(Side.CLIENT)

11
src/dark/farmtech/machines/BlockFT.java
View file

@ -1,20 +1,19 @@
package dark.farmtech.machines;
import com.dark.ModObjectRegistry.BlockBuildData;
import net.minecraft.block.material.Material;
import dark.core.DMCreativeTab;
import dark.core.prefab.machine.BlockMachine;
import dark.farmtech.FarmTech;
/** Prefab class for all farm blocks to remove the need for some configuration of the super class
*
*
* @author Darkguardsman */
public abstract class BlockFT extends BlockMachine
{
public BlockFT(Class<? extends BlockMachine> blockClass, String name, Material material)
public BlockFT(String name, Material material)
{
super(new BlockBuildData(blockClass, name, material).setCreativeTab(DMCreativeTab.tabIndustrial()));
super(FarmTech.CONFIGURATION, name, material);
}
}