Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tntrololol 2015-05-08 21:37:45 -05:00
commit 8b0a1eb894
15 changed files with 127 additions and 4 deletions

View file

@ -54,10 +54,10 @@ public class Core {
{
// Register ModBlocks
ModBlocks.init();
// Register ModItems
ModItems.init();
// Register Fluids
ModFluids.init();
// Register ModItems
ModItems.init();
// Recipes
ModRecipes.init();
//Client only init, needs to be done before parts system

View file

@ -0,0 +1,14 @@
package techreborn.blocks.fluid;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid;
public class BlockCalciumCarbonate extends BlockFluidBase{
public BlockCalciumCarbonate(Fluid fluid, Material material)
{
super(fluid, material);
setBlockName("techreborn.calciumcarbonate");
}
}

View file

@ -8,6 +8,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModFluids;
import techreborn.lib.ModInfo;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

View file

@ -0,0 +1,14 @@
package techreborn.blocks.fluid;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid;
public class BlockFluidCalcium extends BlockFluidBase{
public BlockFluidCalcium(Fluid fluid, Material material)
{
super(fluid, material);
setBlockName("techreborn.calcium");
}
}

View file

@ -0,0 +1,14 @@
package techreborn.blocks.fluid;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.Fluid;
public class BlockFluidChlorite extends BlockFluidBase{
public BlockFluidChlorite(Fluid fluid, Material material)
{
super(fluid, material);
setBlockName("techreborn.chlorite");
}
}

View file

@ -1,9 +1,12 @@
package techreborn.init;
import cpw.mods.fml.common.registry.GameRegistry;
import techreborn.blocks.fluid.BlockCalciumCarbonate;
import techreborn.blocks.fluid.BlockFluidBerylium;
import techreborn.blocks.fluid.BlockFluidChlorite;
import techreborn.lib.ModInfo;
import techreborn.util.BucketHandler;
import techreborn.blocks.fluid.BlockFluidCalcium;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.MinecraftForge;
@ -15,6 +18,15 @@ public class ModFluids {
public static Fluid fluidberylium = new Fluid("fluidberylium");
public static Block BlockFluidBerylium;
public static Fluid fluidcalcium = new Fluid("fluidcalcium");
public static Block BlockFluidCalcium;
public static Fluid fluidcalciumcarbonate = new Fluid("fluidcalciumcarbonate");
public static Block BlockFluidCalciumCarbonate;
public static Fluid fluidChlorite = new Fluid("fluidchlorite");
public static Block BlockFluidChlorite;
public static void init()
{
FluidRegistry.registerFluid(fluidberylium);
@ -22,8 +34,20 @@ public class ModFluids {
GameRegistry.registerBlock(BlockFluidBerylium, ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5));
fluidberylium.setUnlocalizedName(BlockFluidBerylium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidcalcium);
BlockFluidCalcium = new BlockFluidCalcium(fluidcalcium, Material.water);
GameRegistry.registerBlock(BlockFluidCalcium, ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5));
fluidcalcium.setUnlocalizedName(BlockFluidCalcium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidcalciumcarbonate);
BlockFluidCalciumCarbonate = new BlockCalciumCarbonate(fluidcalciumcarbonate, Material.water);
GameRegistry.registerBlock(BlockFluidCalciumCarbonate, ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5));
fluidcalcium.setUnlocalizedName(BlockFluidCalciumCarbonate.getUnlocalizedName());
FluidRegistry.registerFluid(fluidChlorite);
BlockFluidChlorite = new BlockFluidChlorite(fluidChlorite, Material.water);
GameRegistry.registerBlock(BlockFluidChlorite, ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5));
fluidChlorite.setUnlocalizedName(BlockFluidChlorite.getUnlocalizedName());
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidBerylium, ModItems.cells);
MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
}
}

View file

@ -1,9 +1,13 @@
package techreborn.init;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.items.ItemCells;
import techreborn.items.ItemCrushedOre;
@ -22,9 +26,11 @@ import techreborn.items.armor.ItemGravityChest;
import techreborn.items.armor.ItemLapotronPack;
import techreborn.items.armor.ItemLithiumBatpack;
import techreborn.items.tools.ItemAdvancedDrill;
import techreborn.items.tools.ItemFluidbucket;
import techreborn.items.tools.ItemOmniTool;
import techreborn.items.tools.ItemRockCutter;
import techreborn.items.tools.ItemTechPda;
import techreborn.util.BucketHandler;
import techreborn.util.LogHelper;
import cpw.mods.fml.common.registry.GameRegistry;
@ -50,6 +56,8 @@ public class ModItems {
public static Item rods;
public static Item crushedOre;
public static Item purifiedCrushedOre;
public static Item bucketBerylium;
public static void init()
{
@ -93,6 +101,16 @@ public class ModItems {
GameRegistry.registerItem(manuel, "techmanuel");
uuMatter = new ItemUUmatter();
GameRegistry.registerItem(uuMatter, "uumatter");
// buckets
bucketBerylium = new ItemFluidbucket(ModFluids.BlockFluidBerylium);
bucketBerylium.setUnlocalizedName("bucketBerylium").setContainerItem(Items.bucket);
GameRegistry.registerItem(bucketBerylium, "bucketBerylium");
FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fluidberylium", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketBerylium), new ItemStack(Items.bucket));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidBerylium, bucketBerylium);
MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
LogHelper.info("TechReborns Items Loaded");

View file

@ -0,0 +1,38 @@
package techreborn.items.tools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBucket;
public class ItemFluidbucket extends ItemBucket{
private String iconName;
public ItemFluidbucket(Block block)
{
super(block);
setContainerItem(Items.bucket);
setCreativeTab(TechRebornCreativeTabMisc.instance);
setUnlocalizedName("techreborn.fluidbucket");
}
@Override
public Item setUnlocalizedName(String par1Str)
{
iconName = par1Str;
return super.setUnlocalizedName(par1Str);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister)
{
this.itemIcon = par1IconRegister.registerIcon("techreborn:" + iconName);
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B