Update forge

This commit is contained in:
Vincent Lee committed 2016-04-03 18:47:31 -05:00
1 parent 5f3172bd5d
commit 69db133091
197 files changed
+524 -830

No files matched your search

@@ -27,6 +27,7 @@ import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
@@ -43,6 +44,7 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.common.lib.LibMisc;
public class BlockModFlower extends BlockFlower implements ILexiconable, IPickupAchievement, IGrowable {
@@ -55,8 +57,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
}
protected BlockModFlower(String name) {
super();
setUnlocalizedName(name);
GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, name));
registerItemForm();
setHardness(0F);
setSoundType(SoundType.PLANT);
setTickRandomly(false);
@@ -64,6 +67,10 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY));
}
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
return AABB;
@@ -107,12 +114,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
par3List.add(new ItemStack(par1, 1, i));
}
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public Block setLightLevel(float p_149715_1_) {
originalLight = (int) (p_149715_1_ * 15);