Skip to content

Commit

Permalink
TConstruct Ore Structural Change. version 1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
LoveHoly committed Sep 23, 2014
1 parent de7f99b commit 0df25e4
Show file tree
Hide file tree
Showing 177 changed files with 252 additions and 19 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {

apply plugin: 'forge'

version = "1.09b"
version = "1.10"
group= "exastris"
archivesBaseName = "Ex-Astris"

Expand Down
68 changes: 68 additions & 0 deletions src/main/java/ExAstris/Block/BlockOre.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package ExAstris.Block;

import java.util.List;

import ExAstris.Data.ModData;
import net.minecraft.block.BlockSand;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class BlockOre extends BlockSand{

@SideOnly(Side.CLIENT)
private IIcon[] icon;
public String Name;
public BlockOre(String name) {
super();
setHardness(0.4F);
setStepSound(soundTypeSand);
setCreativeTab(CreativeTabs.tabBlock);
Name = name;
}

@Override
public void registerBlockIcons(IIconRegister register)
{
icon = new IIcon[3];

for (int i = 0; i < icon.length; i++)
{
icon[i] = register.registerIcon(ModData.ID+":" + ModData.oreType[i] + "/Block" + Name + ModData.oreType[i]);
}
}

@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta)
{
return icon[meta];
}

@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs tabs, List subItems)
{
for (int i = 0; i < 3; i++) {
subItems.add(new ItemStack(item, 1, i));
}
}

@Override
public int damageDropped (int meta)
{
return meta;
}


@Override
public String getUnlocalizedName()
{
return Name;
}
}
28 changes: 28 additions & 0 deletions src/main/java/ExAstris/Block/ItemBlock/ItemBlockOre.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package ExAstris.Block.ItemBlock;

import ExAstris.Data.ModData;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;

public class ItemBlockOre extends ItemBlock
{

public ItemBlockOre(Block block)
{
super(block);
setHasSubtypes(true);
}

@Override
public String getUnlocalizedName(ItemStack item)
{
return ModData.ID+".block." + this.getUnlocalizedName() + ModData.oreType[item.getItemDamage()];
}

@Override
public int getMetadata (int meta)
{
return meta;
}
}
30 changes: 14 additions & 16 deletions src/main/java/ExAstris/Bridge/TConstruct.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import ExAstris.Data.MoltenData;
import ExAstris.Modifier.ModCrooked;
import ExAstris.Modifier.ModHammered;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import tconstruct.library.TConstructRegistry;
Expand All @@ -12,18 +13,15 @@
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.smeltery.TinkerSmeltery;
import cpw.mods.fml.common.registry.GameRegistry;
import exnihilo.registries.OreRegistry;
import exnihilo.registries.helpers.Color;
//import static net.minecraftforge.fluids.FluidRegistry.getFluid;
import exnihilo.registries.HeatRegistry;

public class TConstruct {
public static void Initialize()
{
if(ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE)
/* if(ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE)
{
addNetherOre();
}
}*/
addSmeltery();
if(ModData.ALLOW_TCONSTRUCT_HEAT_REGISTRY)
{
Expand All @@ -34,25 +32,25 @@ public static void Initialize()
addModifiers();
}
}
public static void addNetherOre()
/*public static void addNetherOre()
{
OreRegistry.createNetherOre("cobalt", new Color("2376dd"), 100, TConstructRegistry.getItem("ingotCobalt"), false);
OreRegistry.createNetherOre("ardite",new Color("f48a00"), 100, TConstructRegistry.getItem("ingotArdite"), false);
OreRegistry.createNetherOre("cobalt",new Color("2376dd"), 100, GameRegistry.findItem("TConstruct", "materials:3"));
OreRegistry.createNetherOre("ardite",new Color("f48a00"), 100, GameRegistry.findItem("TConstruct", "materials:4"));

}
}*/
public static void addSmeltery()
{
if(ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE)
{
Smeltery.addMelting(GameRegistry.findBlock("exastris", "cobalt_dust"), 0, 650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostSmeltery));
Smeltery.addMelting(GameRegistry.findBlock("exastris", "ardite_dust"), 0, 650, new FluidStack(TinkerSmeltery.moltenArditeFluid, MoltenData.ingotCostSmeltery));

Smeltery.addMelting(GameRegistry.findBlock("exastris", "CobaltOreBlock"), 0, 650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostSmeltery));
Smeltery.addMelting(GameRegistry.findBlock("exastris", "ArditeOreBlock"), 0, 650, new FluidStack(TinkerSmeltery.moltenArditeFluid, MoltenData.ingotCostSmeltery));

Smeltery.addMelting(GameRegistry.findBlock("exastris", "cobalt_sand"), 0, 650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostSmeltery));
Smeltery.addMelting(GameRegistry.findBlock("exastris", "ardite_sand"), 0, 650, new FluidStack(TinkerSmeltery.moltenArditeFluid, MoltenData.ingotCostSmeltery));
Smeltery.addMelting(GameRegistry.findBlock("exastris", "CobaltOreBlock"), 1, 650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostSmeltery));
Smeltery.addMelting(GameRegistry.findBlock("exastris", "ArditeOreBlock"), 1, 650, new FluidStack(TinkerSmeltery.moltenArditeFluid, MoltenData.ingotCostSmeltery));

Smeltery.addMelting(GameRegistry.findBlock("exastris", "nether_cobalt_gravel"), 0, 650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostSmeltery));
Smeltery.addMelting(GameRegistry.findBlock("exastris", "nether_ardite_gravel"), 0, 650, new FluidStack(TinkerSmeltery.moltenArditeFluid, MoltenData.ingotCostSmeltery));
Smeltery.addMelting(GameRegistry.findBlock("exastris", "CobaltOreBlock"), 2, 650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostSmeltery));
Smeltery.addMelting(GameRegistry.findBlock("exastris", "ArditeOreBlock"), 2, 650, new FluidStack(TinkerSmeltery.moltenArditeFluid, MoltenData.ingotCostSmeltery));

}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ExAstris/Bridge/TSteelworks.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public static void Initialize()
}
public static void addMeltingRecipe()
{
AdvancedSmelting.addMelting(GameRegistry.findBlock("exastris", "cobalt_dust"),0,650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostHighoven));
AdvancedSmelting.addMelting(GameRegistry.findBlock("exastris", "ardite_dust"),0,650, new FluidStack(TinkerSmeltery.moltenArditeFluid, MoltenData.ingotCostHighoven));
AdvancedSmelting.addMelting(GameRegistry.findBlock("exastris", "CobaltOreBlock"),2,650, new FluidStack(TinkerSmeltery.moltenCobaltFluid, MoltenData.ingotCostHighoven));
AdvancedSmelting.addMelting(GameRegistry.findBlock("exastris", "ArditeOreBlock"),2,650, new FluidStack(TinkerSmeltery.moltenArditeFluid, MoltenData.ingotCostHighoven));

AdvancedSmelting.addMelting(GameRegistry.findBlock("exnihilo", "iron_dust"),0,600, new FluidStack(TinkerSmeltery.moltenIronFluid, MoltenData.ingotCostHighoven));
AdvancedSmelting.addMelting(GameRegistry.findBlock("exnihilo", "gold_dust"),0,400, new FluidStack(TinkerSmeltery.moltenGoldFluid, MoltenData.ingotCostHighoven));
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/ExAstris/Data/BlockData.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

public class BlockData {
//Barrel (Thaumium)!

public static final String BARREL_THAUMIUM_KEY = "barrel_thaumium";
public static final String BARREL_THAUMIUM_UNLOCALIZED_NAME = "barrel.thaumium";

Expand All @@ -13,4 +14,10 @@ public class BlockData {

public static final String ENDCAKE_KEY = "endcake";
public static final String ENDCAKE_UNLOCALIZED_NAME = "endcake";

public static final String THAUMIC_DYNAMO_KEY = "thaumic_dynamo";
public static final String THAUMIC_DYNAMO_UNLOCALIZED_NAME = "thaumic_dynamo";

public static final String SIEVE_ROTARY_KEY = "thaumic_dynamo";
public static final String SIEVE_ROTARY_UNLOCALIZED_NAME = "thaumic_dynamo";
}
2 changes: 2 additions & 0 deletions src/main/java/ExAstris/Data/ModData.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ public static void setMetadata(ModMetadata data)
public static String ALLOW_TCONSTRUCT_MODIFIERS_KEY = "Tconstruct modifiers allowed";
public static boolean ALLOW_TCONSTRUCT_MODIFIERS = true;

public static String[] oreType = { "Gravel","Sand","Dust" };

public static void load(Configuration config)
{
ALLOW_BARREL_THAUMIUM = config.get(CATEGORY_OPTIONS, ALLOW_BARREL_THAUMIUM_KEY, ALLOW_BARREL_THAUMIUM).getBoolean(ALLOW_BARREL_THAUMIUM);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/ExAstris/ExAstris.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public void PreInitialize(FMLPreInitializationEvent event)
public void Initialize(FMLInitializationEvent event)
{
ExAstrisRecipe.registerCraftingRecipes();
ExAstrisRecipe.registerFurnaceRecipes();
FMLInterModComms.sendMessage("Waila", "register", "ExAstris.Bridge.Waila.callbackRegister");
}
@EventHandler
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/ExAstris/ExAstrisBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
import ExAstris.Block.BlockBarrelThaumium;
import ExAstris.Block.BlockBeeTrapInfused;
import ExAstris.Block.BlockEndCake;
import ExAstris.Block.BlockOre;
import ExAstris.Block.BlockSieveAutomatic;
import ExAstris.Block.ItemBlock.ItemBlockBarrelThaumium;
import ExAstris.Block.ItemBlock.ItemBlockEndCake;
import ExAstris.Block.ItemBlock.ItemBlockOre;
import ExAstris.Block.ItemBlock.ItemBlockSieveAutomatic;
import ExAstris.Data.BlockData;
import ExAstris.Data.ModData;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
Expand All @@ -17,6 +20,10 @@ public class ExAstrisBlock {
public static Block BeeTrapInfused;
public static Block SieveAutomatic;
public static Block EndCake;

public static Block cobaltOreBlock;
public static Block arditeOreBlock;

public static void registerBlocks()
{
if(Loader.isModLoaded("Thaumcraft")){
Expand All @@ -35,5 +42,15 @@ public static void registerBlocks()

EndCake = new BlockEndCake();
GameRegistry.registerBlock(EndCake, ItemBlockEndCake.class, BlockData.ENDCAKE_KEY);

if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE)
{
cobaltOreBlock = new BlockOre("Cobalt");
GameRegistry.registerBlock(cobaltOreBlock, ItemBlockOre.class, "CobaltOreBlock");

arditeOreBlock = new BlockOre("Ardite");
GameRegistry.registerBlock(arditeOreBlock, ItemBlockOre.class, "ArditeOreBlock");

}
}
}
13 changes: 13 additions & 0 deletions src/main/java/ExAstris/ExAstrisItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import ExAstris.Item.ItemDollThaumic;
import ExAstris.Item.ItemHammerThaumium;
import ExAstris.Item.ItemDollFreezing;
import ExAstris.Item.ItemOre;
import ExAstris.Item.ItemUnchargedNetherStar;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
Expand All @@ -21,6 +22,10 @@ public class ExAstrisItem {
public static Item HammerRF;
public static Item DollFreezing;
public static Item UnchargedNetherStar;


public static Item cobaltOreItem;
public static Item arditeOreItem;
public static void registerItems()
{
if(Loader.isModLoaded("Thaumcraft")){
Expand All @@ -46,6 +51,14 @@ public static void registerItems()
GameRegistry.registerItem(UnchargedNetherStar, ItemData.UNCHARGED_NETHERSTAR_UNLOCALIZED_NAME);
}

if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE)
{
cobaltOreItem = new ItemOre("Cobalt");
GameRegistry.registerItem(cobaltOreItem, "OreCobaltItem");

arditeOreItem = new ItemOre("Ardite");
GameRegistry.registerItem(arditeOreItem, "OreArditeItem");
}
//GameRegistry.addRecipe(new ShapedOreRecipe(HammerRF, new Object[] { " a ", " ba", "b ", Character.valueOf('a'), RAItems.ingotElectrumFlux, Character.valueOf('b'), RAItems.rodObsidianFlux }));
}
}
27 changes: 27 additions & 0 deletions src/main/java/ExAstris/ExAstrisRecipe.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,39 @@
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;



public class ExAstrisRecipe {
public static void registerFurnaceRecipes()
{
if(Loader.isModLoaded("TConstruct") && ModData.ALLOW_ADD_TCONSTRUCT_NETHERORE)
{
ItemStack cobaltOreBlock = new ItemStack(ExAstrisBlock.cobaltOreBlock);
ItemStack cobaltOreBlock1 = new ItemStack(ExAstrisBlock.cobaltOreBlock);
ItemStack cobaltOreBlock2 = new ItemStack(ExAstrisBlock.cobaltOreBlock);

ItemStack arditeOreBlock = new ItemStack(ExAstrisBlock.arditeOreBlock);
ItemStack arditeOreBlock1 = new ItemStack(ExAstrisBlock.arditeOreBlock);
ItemStack arditeOreBlock2 = new ItemStack(ExAstrisBlock.arditeOreBlock);

cobaltOreBlock1.setItemDamage(1);
cobaltOreBlock2.setItemDamage(2);
GameRegistry.addSmelting(cobaltOreBlock, new ItemStack(GameRegistry.findItem("TConstruct", "materials"), 1, 3), 0.1f);
GameRegistry.addSmelting(cobaltOreBlock1, new ItemStack(GameRegistry.findItem("TConstruct", "materials"), 1, 3), 0.1f);
GameRegistry.addSmelting(cobaltOreBlock2, new ItemStack(GameRegistry.findItem("TConstruct", "materials"), 1, 3), 0.1f);


arditeOreBlock1.setItemDamage(1);
arditeOreBlock2.setItemDamage(2);
GameRegistry.addSmelting(arditeOreBlock, new ItemStack(GameRegistry.findItem("TConstruct", "materials"), 1, 4), 0.1f);
GameRegistry.addSmelting(arditeOreBlock1, new ItemStack(GameRegistry.findItem("TConstruct", "materials"), 1, 4), 0.1f);
GameRegistry.addSmelting(arditeOreBlock2, new ItemStack(GameRegistry.findItem("TConstruct", "materials"), 1, 4), 0.1f);
}
}
public static void registerCraftingRecipes()
{
if(Loader.isModLoaded("RedstoneArsenal") && ModData.ALLOW_HAMMER_RF){
Expand Down
Loading

0 comments on commit 0df25e4

Please sign in to comment.